Mercurial > hg

changeset 1349:c6295d2a361e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More info on file merge for update --debug
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Sep 2005 14:01:05 -0700
parents b8c82bf3da21
children 3729e2773cca
files mercurial/localrepo.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sat Sep 24 11:33:20 2005 -0700
+++ b/mercurial/localrepo.py	Mon Sep 26 14:01:05 2005 -0700
@@ -1287,8 +1287,8 @@
         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")