Mercurial > hg

changeset 16850:9c86ef980d9e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: restore config option on correct ui
author Idan Kamara <idankk86@gmail.com>
date Mon, 04 Jun 2012 15:43:16 +0300
parents a7ba57b10530
children 92cfde8728ac 00e1e40d709c
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Jun 04 18:03:23 2012 +0200
+++ b/mercurial/commands.py	Mon Jun 04 15:43:16 2012 +0300
@@ -2695,7 +2695,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()