]> git.eshelyaron.com Git - emacs.git/commit
Small gitmerge-skip-regexp fix
authorGlenn Morris <rgm@gnu.org>
Mon, 15 Jan 2018 20:28:50 +0000 (12:28 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 15 Jan 2018 20:29:28 +0000 (12:29 -0800)
commit597ede7e5b3c965f1653d15c964e86ccb989a62f
tree53ce5185be7978fdf9cdaefa8a685f4f0ece9d82
parent72ee93d68daea00e2ee69417afd4e31b3145a9fa
Small gitmerge-skip-regexp fix

* admin/gitmerge.el (gitmerge-skip-regexp): Update for new format
of "bump version" message that seems to have appeared.
admin/gitmerge.el