aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/bzrmerge.el2
1 files changed, 1 insertions, 1 deletions
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."
281 ;; are conflicts. 281 ;; are conflicts.
282 (display-warning 'bzrmerge "Resolve conflicts manually. 282 (display-warning 'bzrmerge "Resolve conflicts manually.
283¡BEWARE! Important metadata is kept in this Emacs session! 283¡BEWARE! Important metadata is kept in this Emacs session!
284Do not commit without re-running `M-x bzrmerge' first!"))) 284Do not commit without re-running `M-x bzrmerge' first!"))
285 (error "Resolve conflicts manually"))))) 285 (error "Resolve conflicts manually")))))
286 (cons merge skip))))) 286 (cons merge skip)))))
287 287