Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 11759:05deba16c5d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 06 Aug 2010 12:59:13 -0500
parents a286a4ecbfeb 7d2aaeea67ed
children d12fe809e1ee
line wrap: on
line diff
--- 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)