From: Glenn Morris <rgm@gnu.org>
Date: Mon, 15 Jan 2018 20:28:50 +0000 (-0800)
Subject: Small gitmerge-skip-regexp fix
X-Git-Tag: emacs-27.0.90~5878
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=597ede7e5b3c965f1653d15c964e86ccb989a62f;p=emacs.git

Small gitmerge-skip-regexp fix

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

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 71b1761970c..6011d9bd38f 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -52,7 +52,7 @@
   ;; caused false positives.  --Stef
   (let ((skip "back[- ]?port\\|cherry picked from commit\\|\
 \\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
-bump version\\|Auto-commit"))
+bump \\(Emacs \\)?version\\|Auto-commit"))
     (if noninteractive skip
       ;; "Regenerate" is quite prone to false positives.
       ;; We only want to skip merging things like AUTHORS and ldefs-boot.