From: Glenn Morris <rgm@gnu.org>
Date: Mon, 30 Dec 2019 17:28:29 +0000 (-0800)
Subject: * admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.
X-Git-Tag: emacs-28.0.90~7917
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e729ff504b536ca67030382e5508c1c48f2d0944;p=emacs.git

* admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index edf43797304..31d96b0dab3 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\\|not to be merged\\|\
-bump \\(Emacs \\)?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.