[Emacs-diffs] master b7ec73f: Amend gitmerge to recognize the injunction "don't merge".

[Alan Mackenzie]

branch: master
commit b7ec73f6905df99978f7183ac8e83a3be56edc6c
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>

    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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index c3981dd..a0efce5 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -50,7 +50,7 @@
 (defvar gitmerge-skip-regexp
   ;; We used to include "sync" in there, but in my experience it only
   ;; caused false positives.  --Stef
-  "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) 
merge\\|\
+  "back[- ]?port\\|cherry picked from commit\\|\\(do\\( no\\|n['’]\\)t\\|no 
need to\\) merge\\|\
 re-?generate\\|bump version\\|from trunk\\|Auto-commit"
   "Regexp matching logs of revisions that might be skipped.
 `gitmerge-missing' will ask you if it should skip any matches.")