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

[Glenn Morris]

branch: master
commit e729ff504b536ca67030382e5508c1c48f2d0944
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.
---
 admin/gitmerge.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index edf4379..31d96b0 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.