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".

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index c3981dd4b066038bf3e85d880c24c4a2d9ec6750..a0efce5ea696adb577ac30992b7e488c78c08c0c 100644 (file)
--- 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.")