]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7d2d954) | patch
Amend gitmerge to recognize the injunction "don't merge".
authorAlan Mackenzie <acm@muc.de>
Wed, 29 Mar 2017 17:58:37 +0000 (17:58 +0000)
committerAlan Mackenzie <acm@muc.de>
Wed, 29 Mar 2017 17:58:37 +0000 (17:58 +0000)
commitb7ec73f6905df99978f7183ac8e83a3be56edc6c
treeff002615e157e4148c054c63fa5857f8305e30fetree | snapshot
parent7d2d954d6a4554ee1d17b6a04a9f3aead72b6ececommit | diff
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".
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.