Mercurial > emacs

diff admin/bzrmerge.el @ 112342:c22f11c3d8ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* admin/bzrmerge.el: Fix paren typo in previous.
author Glenn Morris <rgm@gnu.org>
date Mon, 17 Jan 2011 18:35:23 -0800
parents 7e5855ddf3f2
children
line wrap: on
line diff
--- a/admin/bzrmerge.el	Mon Jan 17 18:22:36 2011 -0800
+++ b/admin/bzrmerge.el	Mon Jan 17 18:35:23 2011 -0800
@@ -281,7 +281,7 @@
                   ;; 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)))))