Mercurial > emacs
changeset 112194:978fe18f0882
* admin/bzrmerge.el: Standardize copyright and license headers.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 11 Jan 2011 20:28:12 -0800 |
| parents | 700b890dcfb5 |
| children | 0a2b87003c28 dc74e58f6b0b |
| files | admin/bzrmerge.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/bzrmerge.el Tue Jan 11 23:32:50 2011 +0000 +++ b/admin/bzrmerge.el Tue Jan 11 20:28:12 2011 -0800 @@ -1,22 +1,22 @@ ;;; bzrmerge.el --- -;; Copyright (C) 2010 Stefan Monnier +;; Copyright (C) 2010, 2011 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: -;; This program is free software; you can redistribute it and/or modify +;; 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 ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: @@ -202,7 +202,7 @@ "merge" "-r" (format "%s" endrevno) from) (call-process "bzr" nil t nil "revert" ".") (call-process "bzr" nil t nil "unshelve"))) - + (defvar bzrmerge-already-done nil) (defun bzrmerge-apply (missing from)