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

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index edf43797304e85b53a947850afbcb842cd4b9b5b..31d96b0dab33b744cf2a8fad453f78aa986447c6 100644 (file)
--- 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.