Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 16864:92cfde8728ac

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 Mon, 04 Jun 2012 16:59:57 -0500
parents d71ada5a6a33 9c86ef980d9e
children 91f3ac205816
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jun 01 15:19:08 2012 -0700
+++ b/mercurial/commands.py	Mon Jun 04 16:59:57 2012 -0500
@@ -2744,7 +2744,7 @@
                     stats = mergemod.update(repo, ctx.node(), True, True, False,
                                             ctx.p1().node())
                 finally:
-                    ui.setconfig('ui', 'forcemerge', '')
+                    repo.ui.setconfig('ui', 'forcemerge', '')
                 # drop the second merge parent
                 repo.setparents(current.node(), nullid)
                 repo.dirstate.write()