changeset 4633 | ff7253a0d1da |
parent 4603 | 66ed92ed115a |
child 4635 | 63b9d2deed48 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -65,7 +65,7 @@ def checkunknown(wctx, mctx): for f in wctx.unknown(): if f in man: if mctx.filectx(f).cmp(wctx.filectx(f).data()): - raise util.Abort(_("untracked local file '%s' differs"\ + raise util.Abort(_("untracked local file '%s' differs" " from remote version") % f) def checkcollision(mctx):