# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1295318123 28800
# Node ID c22f11c3d8ba54ee77d63f5d4193ab8e7e2775c7
# Parent  1bdb2b6bdebb903a1f536182087b5e4da4a0a2ae
* admin/bzrmerge.el: Fix paren typo in previous.

diff -r 1bdb2b6bdebb -r c22f11c3d8ba admin/bzrmerge.el
--- 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)))))