Show More
| @@ -1062,7 +1062,6 b' class localrepository:' | |||||
| 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] | |
General Comments 0
You need to be logged in to leave comments.
Login now