diff -r b8c82bf3da21 -r c6295d2a361e mercurial/localrepo.py
--- 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")