| commit | b7ec73f6905df99978f7183ac8e83a3be56edc6c | |
| author | Alan Mackenzie <acm@muc.de> | |
| Wed, 29 Mar 2017 17:58:37 +0000 (29 17:58 +0000) | ||
| committer | Alan Mackenzie <acm@muc.de> | |
| Wed, 29 Mar 2017 17:58:37 +0000 (29 17:58 +0000) | ||
| tree | ff002615e157e4148c054c63fa5857f8305e30fe | treesnapshot (tar.gz zip) |
| parent | 7d2d954d6a4554ee1d17b6a04a9f3aead72b6ece | commitdiff |
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 (gitmerge-skip-regexp): amend regexp to match "don't" as
well as "do not".
| admin/gitmerge.el | diffblobblamehistory |