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

diff --git a/admin/ChangeLog b/admin/ChangeLog
index a3a756bde641e091f8cddc5679e571c886d0d6ee..01f10f4aea5dce88c35eac9278f67ea83a7606dc 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-02  Glenn Morris  <rgm@gnu.org>
+
+       * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
+
 2012-04-10  Glenn Morris  <rgm@gnu.org>
 
        * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
@@ -1262,7 +1266,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 0c72c8b5c93d1ef9660e06e359dd355b9e1cc6c5..15238f44d9d52965f324b7b3e2b388b948c7cdb2 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.")