# HG changeset patch
# User Idan Kamara <idankk86@gmail.com>
# Date 1309865793 -10800
# Node ID 11b5a5d2ca8b99442dd721a0f95458f1b3f4ec16
# Parent  510c893a726f202b2aa99f615e1b9849e1f0d367
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 510c893a726f -r 11b5a5d2ca8b 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', '')