* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".

[gnu-emacs] / admin / gitmerge.el

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a07f57a60089a57e2195f9ed14abb1ba20153a35..74e6f80487b7013d9253983c17b204df7d53ae4a 100644 (file)
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -50,7 +50,7 @@
 (defvar gitmerge-skip-regexp
   ;; We used to include "sync" in there, but in my experience it only
   ;; caused false positives.  --Stef
-  "back[- ]?port\\|do not merge\\|re-?generate\\|bump version\\|from trunk\\|\
+  "back[- ]?port\\|\\(do not\\|no need to\\) merge\\|re-?generate\\|bump version\\|from trunk\\|\
 Auto-commit"
   "Regexp matching logs of revisions that might be skipped.
 `gitmerge-missing' will ask you if it should skip any matches.")