* src/macfont.m (mac_font_shape): Make sure that total_advance is increasing.

[gnu-emacs] / admin / gitmerge.el

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 6a52f7a60a913e6fd0c24df5af4c8ec5e7fe10e1..d2cb1e8df03442ebb800e931d2cb784cdfdfc34b 100644 (file)
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -50,8 +50,8 @@
 (defvar gitmerge-skip-regexp
   ;; We used to include "sync" in there, but in my experience it only
   ;; caused false positives.  --Stef
-  "back[- ]?port\\|\\(do not\\|no need to\\) merge\\|re-?generate\\|bump version\\|from trunk\\|\
-Auto-commit"
+  "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|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.")