[Emacs-diffs] master 6bd1e220: Keep "merge" commits by default in gitmerge

[Paul Eggert]

branch: master
commit 6bd1e2203486ace170f5de15cf7d66146fc8cc87
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index ae863fd..ed87643 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -50,7 +50,7 @@
 (defvar gitmerge-skip-regexp
   ;; We used to include "sync" in there, but in my experience it only
   ;; caused false positives.  --Stef
-  "back[- ]?port\\|merge\\|re-?generate\\|bump version\\|from trunk\\|\
+  "back[- ]?port\\|re-?generate\\|bump version\\|from trunk\\|\
 Auto-commit"
   "Regexp matching logs of revisions that might be skipped.
 `gitmerge-missing' will ask you if it should skip any matches.")