diff -r 8d46056960ab -r ff7253a0d1da mercurial/merge.py
--- a/mercurial/merge.py	Mon Jun 18 21:30:27 2007 -0500
+++ b/mercurial/merge.py	Tue Jun 19 08:06:37 2007 +0200
@@ -65,7 +65,7 @@
     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):