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

Add header keyword.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1cc52bc5fb5b53be2c0411687b5126162512bfeb..a3a756bde641e091f8cddc5679e571c886d0d6ee 100644 (file)
--- 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 cb63d5b16baa3f0bd598948298d1ed284686246a..0c72c8b5c93d1ef9660e06e359dd355b9e1cc6c5 100644 (file)
--- 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.")