Mercurial > hg

diff mercurial/merge.py @ 6381:0b89315d5de2

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.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 24 Mar 2008 20:28:13 +0100
parents cdc458b12f0f
children 2d9328a2f81f
line wrap: on
line diff
--- 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 "