changeset 412 | 40cfa2d0c088 |
parent 408 | 3695fbd2c33b |
child 413 | a3b5347c22cd |
--- 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)