From 874f69acecf0c6c3c4886375c092fb389d207241 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 10 Dec 2018 12:42:17 -0500 Subject: * admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant. --- admin/gitmerge.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'admin/gitmerge.el') 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. -- cgit v1.2.1