* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".

[bpt/emacs.git] / admin / bzrmerge.el

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 0c72c8b..15238f4 100644 (file)
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -28,7 +28,8 @@
   (require 'cl))                        ; assert
 
 (defvar bzrmerge-skip-regexp
-  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk"
+  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk\\|\
+Auto-commit"
   "Regexp matching logs of revisions that might be skipped.
 `bzrmerge-missing' will ask you if it should skip any matches.")