From c9279dad0b22996b74a959ede6939fe4f2c3357c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Apr 2012 13:27:01 -0400 Subject: [PATCH] * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". Add header keyword. --- admin/ChangeLog | 2 ++ admin/bzrmerge.el | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 1cc52bc5fb..a3a756bde6 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,7 @@ 2012-04-10 Glenn Morris + * 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 cb63d5b16b..0c72c8b5c9 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 -;; 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.") -- 2.20.1