From: Glenn Morris <rgm@gnu.org>
Date: Tue, 18 Jan 2011 02:35:23 +0000 (-0800)
Subject: * admin/bzrmerge.el: Fix paren typo in previous.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~221
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acce4a473ad27f2dec42cf2d35ffe3bb1acd471a;p=emacs.git

* admin/bzrmerge.el: Fix paren typo in previous.
---

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 68b107be65e..85d0f14091a 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -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)))))