changeset 6381 | 0b89315d5de2 |
parent 6375 | cdc458b12f0f |
child 6425 | 2d9328a2f81f |
--- 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 "