From: Glenn Morris <rgm@gnu.org>
Date: Tue, 10 Apr 2012 17:27:01 +0000 (-0400)
Subject: * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
X-Git-Tag: emacs-24.2.90~471^2~365^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9279dad0b22996b74a959ede6939fe4f2c3357c;p=emacs.git

* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
Add header keyword.
---

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1cc52bc5fb5..a3a756bde64 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,7 @@
 2012-04-10  Glenn Morris  <rgm@gnu.org>
 
+	* bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
+
 	* unidata/Makefile.in: Add FSF copyright.
 	Make it use autoconf features, and work for out-of-tree builds.
 
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index cb63d5b16ba..0c72c8b5c93 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,9 +1,9 @@
 ;;; bzrmerge.el --- help merge one Emacs bzr branch to another
 
-;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: 
+;; Keywords: maint
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
   (require 'cl))                        ; assert
 
 (defvar bzrmerge-skip-regexp
-  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version"
+  "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version\\|from trunk"
   "Regexp matching logs of revisions that might be skipped.
 `bzrmerge-missing' will ask you if it should skip any matches.")