# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1206386893 -3600
# Node ID 0b89315d5de2549662dc35dec90aee21db6fd77b
# Parent  a632a9a5782103101772f8708b3a316a4ca1530e
Fix missing space in one of the new update messages.

diff -r a632a9a57821 -r 0b89315d5de2 mercurial/merge.py
--- 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 "
diff -r a632a9a57821 -r 0b89315d5de2 tests/test-merge5.out
--- 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')