diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/bzrmerge.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index a33d666e143..d725f8a559a 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -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 @@ Does not make other difference." "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) |