Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 4633:ff7253a0d1da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup of whitespace, indentation and line continuation.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 19 Jun 2007 08:06:37 +0200
parents 66ed92ed115a
children 63b9d2deed48
line wrap: on
line diff
--- 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):