From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 Mar 2016 22:46:30 +0000 (-0700)
Subject: * admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".
X-Git-Tag: emacs-26.0.90~2299
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4fab26ba5ac381ce836eff521fc56d8d28570221;p=emacs.git

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

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