diff options
| author | Glenn Morris <[email protected]> | 2012-05-02 00:12:52 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-05-02 00:12:52 -0700 |
| commit | 6116bd7e7a88d47eb8bf0b830249461f47f8b943 (patch) | |
| tree | be964463f3def31ab25eea2f51c666197c55580d /admin | |
| parent | 7adecb9936e52431118a060d87e0550b3bc5ad4b (diff) | |
* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 6 | ||||
| -rw-r--r-- | admin/bzrmerge.el | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index a3a756bde6..01f10f4aea 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2012-05-02 Glenn Morris <[email protected]> + + * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". + 2012-04-10 Glenn Morris <[email protected]> * 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 0c72c8b5c9..15238f44d9 100644 --- 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.") |