Fix missing space in one of the new update messages.
--- a/mercurial/merge.py Mon Mar 24 16:17:19 2008 -0300
+++ b/mercurial/merge.py Mon Mar 24 20:28:13 2008 +0100
@@ -373,7 +373,7 @@
if wc.files() or wc.deleted():
raise util.Abort(_("crosses branches (use 'hg merge' or "
"'hg update -C' to discard changes)"))
- raise util.Abort(_("crosses branches (use 'hg merge'"
+ raise util.Abort(_("crosses branches (use 'hg merge' "
"or 'hg update -C')"))
elif wc.files() or wc.deleted():
raise util.Abort(_("crosses named branches (use "
--- a/tests/test-merge5.out Mon Mar 24 16:17:19 2008 -0300
+++ b/tests/test-merge5.out Mon Mar 24 20:28:13 2008 +0100
@@ -4,4 +4,4 @@
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
-abort: crosses branches (use 'hg merge'or 'hg update -C')
+abort: crosses branches (use 'hg merge' or 'hg update -C')