1060 if n != m2[f]: |
1060 if n != m2[f]: |
1061 a = ma.get(f, nullid) |
1061 a = ma.get(f, nullid) |
1062 # are both different from the ancestor? |
1062 # are both different from the ancestor? |
1063 if n != a and m2[f] != a: |
1063 if n != a and m2[f] != a: |
1064 self.ui.debug(" %s versions differ, resolve\n" % f) |
1064 self.ui.debug(" %s versions differ, resolve\n" % f) |
1065 merge[f] = (m1.get(f, nullid), m2[f]) |
|
1066 # merge executable bits |
1065 # merge executable bits |
1067 # "if we changed or they changed, change in merge" |
1066 # "if we changed or they changed, change in merge" |
1068 a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
1067 a, b, c = mfa.get(f, 0), mfw[f], mf2[f] |
1069 mode = ((a^b) | (a^c)) ^ a |
1068 mode = ((a^b) | (a^c)) ^ a |
1070 merge[f] = (m1.get(f, nullid), m2[f], mode) |
1069 merge[f] = (m1.get(f, nullid), m2[f], mode) |