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 71b1761970c964f5e5190042f3b1356516672d07..6011d9bd38f968ee7953754474c5963110734397 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\\|\
-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.