From: Glenn Morris <rgm@gnu.org>
Date: Mon, 10 Dec 2018 17:42:17 +0000 (-0500)
Subject: * admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
X-Git-Tag: emacs-27.0.90~4008
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=874f69acecf0c6c3c4886375c092fb389d207241;p=emacs.git

* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 6dedee8dd14..e7d25674c81 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -51,7 +51,7 @@
   ;; We used to include "sync" in there, but in my experience it only
   ;; caused false positives.  --Stef
   (let ((skip "back[- ]?port\\|cherry picked from commit\\|\
-\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
+\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|not to be merged\\|\
 bump \\(Emacs \\)?version\\|Auto-commit"))
     (if noninteractive skip
       ;; "Regenerate" is quite prone to false positives.