From acce4a473ad27f2dec42cf2d35ffe3bb1acd471a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 17 Jan 2011 18:35:23 -0800 Subject: [PATCH] * admin/bzrmerge.el: Fix paren typo in previous. --- admin/bzrmerge.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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))))) -- 2.39.2