mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Small gitmerge-skip-regexp fix

Browse source 
* admin/gitmerge.el (gitmerge-skip-regexp): Update for new format
of "bump version" message that seems to have appeared.
This commit is contained in:
Glenn Morris 2018-01-15 12:28:50 -08:00
parent 72ee93d68d
commit 597ede7e5b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/gitmerge.el
View file

@ -52,7 +52,7 @@
;; caused false positives. --Stef
(let ((skip "back[- ]?port\\|cherry picked from commit\\|\
\\(do\\( no\\|n['’]\\)t\\|no need to\\) merge\\|\
bump 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.