]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 780a605) | patch
Keep "merge" commits by default in gitmerge
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 17:52:54 +0000 (10:52 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 22 Mar 2016 17:52:54 +0000 (10:52 -0700)
commit6bd1e2203486ace170f5de15cf7d66146fc8cc87
treef497a0c2de375231af1ce1423ba2e6d35d90e48etree | snapshot
parent780a605e1d2de4b975e6f1f29b491c9af419dcffcommit | diff
Keep "merge" commits by default in gitmerge

* admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
causes false positives.  See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.