[PATCH] commands, merge: call setconfig on the right ui

[Idan Kamara]

# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1309865793 -10800
# Node ID a56b3106345d1dd60a25a32fb43fe23f1d2c2d8f
# Parent  bdf2cb5fd626908788ce7807986f982523d9da71
commands, merge: call setconfig on the right ui

In practice this doesn't change anything since ui == repo.ui here, but setting
repo.ui explicitly here is clearer since hg.merge will use repo.ui later on.

diff -r bdf2cb5fd626 -r a56b3106345d mercurial/commands.py
--- a/mercurial/commands.py	Tue Jul 05 14:28:55 2011 +0300
+++ b/mercurial/commands.py	Tue Jul 05 14:36:33 2011 +0300
@@ -3587,7 +3587,7 @@
 
     try:
         # ui.forcemerge is an internal variable, do not document
-        ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
+        repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
         return hg.merge(repo, node, force=opts.get('force'))
     finally:
         ui.setconfig('ui', 'forcemerge', '')