changeset 413 | a3b5347c22cd |
parent 412 | 40cfa2d0c088 |
child 415 | c2b9502a4e96 |
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1062,7 +1062,6 @@ class localrepository: # are both different from the ancestor? if n != a and m2[f] != a: self.ui.debug(" %s versions differ, resolve\n" % f) - merge[f] = (m1.get(f, nullid), m2[f]) # merge executable bits # "if we changed or they changed, change in merge" a, b, c = mfa.get(f, 0), mfw[f], mf2[f]