--- a/mercurial/hg.py	Tue Jun 21 19:06:17 2005 -0800
+++ b/mercurial/hg.py	Tue Jun 21 19:07:13 2005 -0800
@@ -1062,7 +1062,6 @@
                     # are both different from the ancestor?
                     if n != a and m2[f] != a:
                         self.ui.debug(" %s versions differ, resolve\n" % f)
-                        merge[f] = (m1.get(f, nullid), m2[f])
                         # merge executable bits
                         # "if we changed or they changed, change in merge"
                         a, b, c = mfa.get(f, 0), mfw[f], mf2[f]