# HG changeset patch
# User mpm@selenic.com
# Date 1119409633 28800
# Node ID a3b5347c22cd48bd912771e6445ea57afa321e0f
# Parent  40cfa2d0c088b236ece1e6bab0666ed7210fb0da
remove double assignment

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

remove double assignment

spotted by Goffredo Baroncelli

manifest hash: a0406a618ce5b2b9b10073b29960d594094aa3ed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuNXhywK+sNU5EO8RAh9yAJ0aVTnxsumDAdF3JORp1pDebxeE8wCgisdG
vf/JwxHbQEqGrefU1nbs928=
=NDGW
-----END PGP SIGNATURE-----


diff -r 40cfa2d0c088 -r a3b5347c22cd mercurial/hg.py
--- 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]