Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 12765 5eed9ceebd64
parent 12754 eaac5e8cb637
child 12788 de793925862e 
--- a/mercurial/commands.py	Mon Oct 18 14:10:36 2010 +0900
+++ b/mercurial/commands.py	Mon Oct 18 23:20:14 2010 -0500
@@ -2589,7 +2589,7 @@
     t = opts.get('tool')
     if t:
         if 'HGMERGE' in os.environ:
-            os.environ['HGMERGE'] = t
+            os.environ['HGMERGE'] = ''
         ui.setconfig('ui', 'merge', t)
 
     if not node:
@@ -2982,7 +2982,7 @@
     t = opts.get('tool')
     if t:
         if 'HGMERGE' in os.environ:
-            os.environ['HGMERGE'] = t
+            os.environ['HGMERGE'] = ''
         ui.setconfig('ui', 'merge', t)
 
     ms = mergemod.mergestate(repo)
Mercurial