]> git.eshelyaron.com Git - emacs.git/commit
* admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)
authorGlenn Morris <rgm@gnu.org>
Sat, 2 Dec 2017 03:06:40 +0000 (22:06 -0500)
committerGlenn Morris <rgm@gnu.org>
Sat, 2 Dec 2017 03:06:40 +0000 (22:06 -0500)
commit0b6f4f2c6086a04b27d87d4f06b71334da3933d5
treeab909b893a16db55aa407c0f764c250905a9fec5
parent7c95819de0bb351e77449877cb6899444a99d0c1
* admin/gitmerge.el (gitmerge-resolve): Handle NEWS.  (Bug#29366)
admin/gitmerge.el