diff options
author | Alan Mackenzie <acm@muc.de> | 2017-03-29 17:58:37 +0000 |
---|---|---|
committer | Alan Mackenzie <acm@muc.de> | 2017-03-29 17:58:37 +0000 |
commit | b7ec73f6905df99978f7183ac8e83a3be56edc6c (patch) | |
tree | ff002615e157e4148c054c63fa5857f8305e30fe /test/lisp/emacs-lisp/rx-tests.el | |
parent | 7d2d954d6a4554ee1d17b6a04a9f3aead72b6ece (diff) | |
download | emacs-b7ec73f6905df99978f7183ac8e83a3be56edc6c.tar.gz emacs-b7ec73f6905df99978f7183ac8e83a3be56edc6c.tar.bz2 emacs-b7ec73f6905df99978f7183ac8e83a3be56edc6c.zip |
Amend gitmerge to recognize the injunction "don't merge".
* admin/gitmerge.el (gitmerge-skip-regexp): amend regexp to match "don't" as
well as "do not".
Diffstat (limited to 'test/lisp/emacs-lisp/rx-tests.el')
0 files changed, 0 insertions, 0 deletions