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

6116bd7e · Glenn Morris · 7adecb99 · 6116bd7e · 6116bd7e
Commit 6116bd7e authored May 02, 2012 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

admin/ChangeLog admin/ChangeLog +5 -1

admin/bzrmerge.el admin/bzrmerge.el +2 -1

No files found.
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
+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.


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