Mercurial > hg

changeset 14840:11b5a5d2ca8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Idan Kamara <idankk86@gmail.com>
date Tue, 05 Jul 2011 14:36:33 +0300
parents 510c893a726f
children 7aaae5466ad3
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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', '')