equal
deleted
inserted
replaced
1116 return name |
1116 return name |
1117 |
1117 |
1118 fl = self.file(fn) |
1118 fl = self.file(fn) |
1119 base = fl.ancestor(my, other) |
1119 base = fl.ancestor(my, other) |
1120 a = self.wjoin(fn) |
1120 a = self.wjoin(fn) |
1121 b = temp("other", other) |
1121 b = temp("base", base) |
1122 c = temp("base", base) |
1122 c = temp("other", other) |
1123 |
1123 |
1124 self.ui.note("resolving %s\n" % fn) |
1124 self.ui.note("resolving %s\n" % fn) |
1125 self.ui.debug("file %s: other %s ancestor %s\n" % |
1125 self.ui.debug("file %s: other %s ancestor %s\n" % |
1126 (fn, short(other), short(base))) |
1126 (fn, short(other), short(base))) |
1127 |
1127 |