changeset 1349 | c6295d2a361e |
parent 1346 | 88a9c75dc76a |
child 1353 | a0c68981a5f4 |
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1287,8 +1287,8 @@ class localrepository: c = temp("other", other) self.ui.note("resolving %s\n" % fn) - self.ui.debug("file %s: other %s ancestor %s\n" % - (fn, short(other), short(base))) + self.ui.debug("file %s: my %s other %s ancestor %s\n" % + (fn, short(my), short(other), short(base))) cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge") or "hgmerge")