changeset 3620 | 3109f012c305 |
parent 3593 | 9bfb3c049b2a |
child 3673 | eb0b4a2d70a9 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -65,8 +65,8 @@ 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(_("'%s' already exists in the working" - " dir and differs from remote") % f) + raise util.Abort(_("untracked local file '%s' differs"\ + " from remote version") % f) def forgetremoved(wctx, mctx): """