changeset 346 | f69a5d2d4fe1 |
parent 344 | db419f14df4b |
child 350 | b4e0e20646bb |
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1118,8 +1118,8 @@ class localrepository: fl = self.file(fn) base = fl.ancestor(my, other) a = self.wjoin(fn) - b = temp("other", other) - c = temp("base", base) + b = temp("base", base) + c = temp("other", other) self.ui.note("resolving %s\n" % fn) self.ui.debug("file %s: other %s ancestor %s\n" %