diff -r b8b4a2417fbd -r 05deba16c5d5 mercurial/merge.py
--- a/mercurial/merge.py	Wed Aug 04 13:21:11 2010 -0500
+++ b/mercurial/merge.py	Fri Aug 06 12:59:13 2010 -0500
@@ -323,6 +323,7 @@
             repo.ui.note(_("getting %s\n") % f)
             t = mctx.filectx(f).data()
             repo.wwrite(f, t, flags)
+            t = None
             updated += 1
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx)