[PATCH] graft: restore config option on correct ui

[Idan Kamara]

# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1338813796 -10800
# Node ID ad490a6312a0fac436400bd57e8ddf86a49e7123
# Parent  357e6bcfb61973478bfbe4cf5652026a6bda7ef7
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
@@ -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()