]> git.eshelyaron.com Git - emacs.git/commitdiff
* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
authorGlenn Morris <rgm@gnu.org>
Mon, 10 Dec 2018 17:42:17 +0000 (12:42 -0500)
committerGlenn Morris <rgm@gnu.org>
Mon, 10 Dec 2018 17:42:17 +0000 (12:42 -0500)
admin/gitmerge.el

index 6dedee8dd14f1719fb94ab2199e9a267abf3324b..e7d25674c815435dc68b7cfe9022efa3c1f0b810 100644 (file)
@@ -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.