[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108090: * admin/bzrmerge.el (bzrmerg
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108090: * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". |
Date: |
Wed, 02 May 2012 00:12:52 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108090
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-02 00:12:52 -0700
message:
* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
modified:
admin/ChangeLog
admin/bzrmerge.el
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2012-04-10 17:27:01 +0000
+++ b/admin/ChangeLog 2012-05-02 07:12:52 +0000
@@ -1,3 +1,7 @@
+2012-05-02 Glenn Morris <address@hidden>
+
+ * bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
+
2012-04-10 Glenn Morris <address@hidden>
* 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.
=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2012-04-10 17:27:01 +0000
+++ b/admin/bzrmerge.el 2012-05-02 07:12:52 +0000
@@ -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.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108090: * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".,
Glenn Morris <=