]> git.eshelyaron.com Git - emacs.git/commit
* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
authorGlenn Morris <rgm@gnu.org>
Mon, 10 Dec 2018 17:42:17 +0000 (12:42 -0500)
committerGlenn Morris <rgm@gnu.org>
Mon, 10 Dec 2018 17:42:17 +0000 (12:42 -0500)
commit874f69acecf0c6c3c4886375c092fb389d207241
treef7f10307b0ac312fab06c370cf9377dd426a9c35
parentedd0c241162ed7242767c16a3737d84be336d4f9
* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
admin/gitmerge.el