Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More info on file merge for update --debug
authorMatt Mackall <mpm@selenic.com>
Mon, 26 Sep 2005 14:01:05 -0700
changeset 1349 c6295d2a361e
parent 1348 b8c82bf3da21
child 1350 3729e2773cca
More info on file merge for update --debug
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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")
mercurial-crew-with-dirclash