changeset 22966 | ff93aa006e6a |
parent 22965 | b697fa74b475 |
child 23319 | 3177d710630d |
child 23420 | 902554884335 |
--- a/mercurial/merge.py Tue Oct 14 22:48:44 2014 -0700 +++ b/mercurial/merge.py Tue Oct 14 23:18:07 2014 -0700 @@ -424,7 +424,7 @@ # Compare manifests diff = m1.diff(m2) - for f, ((n1, n2), (fl1, fl2)) in diff.iteritems(): + for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): if partial and not partial(f): continue if n1 and n2: