Commit c9279dad authored by Glenn Morris's avatar Glenn Morris
Browse files

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

Add header keyword.
parent 9f67961c
2012-04-10 Glenn Morris <>
* bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
* unidata/ Add FSF copyright.
Make it use autoconf features, and work for out-of-tree builds.
;;; 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.")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment