diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-12-10 12:42:17 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-12-10 12:42:17 -0500 |
| commit | 874f69acecf0c6c3c4886375c092fb389d207241 (patch) | |
| tree | f7f10307b0ac312fab06c370cf9377dd426a9c35 /admin | |
| parent | edd0c241162ed7242767c16a3737d84be336d4f9 (diff) | |
| download | emacs-874f69acecf0c6c3c4886375c092fb389d207241.tar.gz | |
* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
Diffstat (limited to 'admin')
| -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. |