diff mercurial/localrepo.py @ 2902:cd7bbb19b96e

merge with mpm.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 15 Aug 2006 09:37:58 -0700
parents 05257fd28591
children 5bb65c3945a3
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -668,8 +668,7 @@ class localrepository(repo.repository):
 
         def fcmp(fn, mf):
             t1 = self.wread(fn)
-            t2 = self.file(fn).read(mf.get(fn, nullid))
-            return cmp(t1, t2)
+            return self.file(fn).cmp(mf.get(fn, nullid), t1)
 
         def mfmatches(node):
             change = self.changelog.read(node)