]> git.eshelyaron.com Git - emacs.git/commitdiff
* admin/bzrmerge.el: Fix paren typo in previous.
authorGlenn Morris <rgm@gnu.org>
Tue, 18 Jan 2011 02:35:23 +0000 (18:35 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 18 Jan 2011 02:35:23 +0000 (18:35 -0800)
admin/bzrmerge.el

index 68b107be65e6f9a688ca6eb58cb9cd25d0021c5e..85d0f14091aa71fda706c0b412d412536c17d25c 100644 (file)
@@ -281,7 +281,7 @@ Does not make other difference."
                   ;; are conflicts.
                   (display-warning 'bzrmerge "Resolve conflicts manually.
 ¡BEWARE!  Important metadata is kept in this Emacs session!
-Do not commit without re-running `M-x bzrmerge' first!")))
+Do not commit without re-running `M-x bzrmerge' first!"))
               (error "Resolve conflicts manually")))))
         (cons merge skip)))))