diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 12:53:54 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 12:57:24 -0700 |
| commit | b08237185ec044c8afff0feb88a126512b33a6d8 (patch) | |
| tree | bba338084846f88e814d5569f5806057aef32575 /lisp/emacs-lisp | |
| parent | 582962a3a184135047c5809b1172691a1c5f2586 (diff) | |
| download | emacs-b08237185ec044c8afff0feb88a126512b33a6d8.tar.gz emacs-b08237185ec044c8afff0feb88a126512b33a6d8.tar.bz2 emacs-b08237185ec044c8afff0feb88a126512b33a6d8.zip | |
Change do-not-merge pattern to "do not merge"
This should avoid the problem we recently had with
automatically-generated merge messages, while still letting people
specify commits not to merge.
* admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge".
(gitmerge-highlight-skip-regexp): Fold case when searching
for gitmerge-skip-regexp.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions