# HG changeset patch
# User Idan Kamara <idankk86@gmail.com>
# Date 2012-06-04 12:43:16
# Node ID 9c86ef980d9e85a855585b1b933c930f4488a56a
# Parent  a7ba57b1053017799e3dcdb04c61d2251f53a2a8

graft: restore config option on correct ui

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2695,7 +2695,7 @@ def graft(ui, repo, *revs, **opts):
                     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()