diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-12-30 09:28:29 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-12-30 15:53:51 -0800 |
| commit | e729ff504b536ca67030382e5508c1c48f2d0944 (patch) | |
| tree | f05066e8a2433bda7728f7ada200ff1189d1c44d /admin | |
| parent | 248c5e103d61af4352e2c8d9b810babdd4cd6ddf (diff) | |
| download | emacs-e729ff504b536ca67030382e5508c1c48f2d0944.tar.gz | |
* admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.
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 edf43797304..31d96b0dab3 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -52,7 +52,7 @@ ;; caused false positives. --Stef (let ((skip "back[- ]?port\\|cherry picked from commit\\|\ \\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|not to be merged\\|\ -bump \\(Emacs \\)?version\\|Auto-commit")) +bump Emacs version\\|Auto-commit")) (if noninteractive skip ;; "Regenerate" is quite prone to false positives. ;; We only want to skip merging things like AUTHORS and ldefs-boot. |