[Emacs-diffs] master 4fab26b: * admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".

[Paul Eggert]

branch: master
commit 4fab26ba5ac381ce836eff521fc56d8d28570221
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    * admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".
---
 admin/gitmerge.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index a07f57a..74e6f80 100644
--- 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.")