From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 Mar 2016 17:52:54 +0000 (-0700)
Subject: Keep "merge" commits by default in gitmerge
X-Git-Tag: emacs-26.0.90~2308
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bd1e2203486ace170f5de15cf7d66146fc8cc87;p=emacs.git

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
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index ae863fdecb5..ed876436356 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.")