Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3620:3109f012c305
Clarify untracked file merge message
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Nov 2006 21:47:55 -0600 |
parents | 9bfb3c049b2a |
children | eb0b4a2d70a9 |
line wrap: on
line diff
--- 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): """