diff options
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
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. |