diff -r 638193139ba8 -r 3109f012c305 mercurial/merge.py
--- a/mercurial/merge.py	Mon Nov 06 22:01:09 2006 -0800
+++ b/mercurial/merge.py	Wed Nov 01 21:47:55 2006 -0600
@@ -65,8 +65,8 @@
     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):
     """