Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix missing space in one of the new update messages.
authorThomas Arendsen Hein <thomas@intevation.de>
Mon, 24 Mar 2008 20:28:13 +0100
changeset 6381 0b89315d5de2
parent 6380 a632a9a57821
child 6382 f3c3965fa0ff
Fix missing space in one of the new update messages.
mercurial/merge.py file | annotate | diff | comparison | revisions
tests/test-merge5.out file | annotate | diff | comparison | revisions 
--- 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')
mercurial