diff -r 9e9f7ab43ce2 -r 40cfa2d0c088 mercurial/hg.py --- a/mercurial/hg.py Tue Jun 21 18:54:44 2005 -0800 +++ b/mercurial/hg.py Tue Jun 21 19:06:17 2005 -0800 @@ -1007,7 +1007,7 @@ m2 = self.manifest.read(m2n) mf2 = self.manifest.readflags(m2n) ma = self.manifest.read(man) - mfa = self.manifest.readflags(m2n) + mfa = self.manifest.readflags(man) (c, a, d, u) = self.diffdir(self.root)