Commits

TK Soh committed 5aee031

commit: respect merge-tools' .executable settings

Comments (0)

Files changed (1)

tortoisehg/hgtk/status.py

 import threading
 
 from mercurial import cmdutil, util, patch, error, hg
-from mercurial import merge as merge_
+from mercurial import merge as merge_, filemerge
 
 from tortoisehg.util.i18n import _
 from tortoisehg.util import hglib, paths, hgshelve
             self.reload_status()
         def resolve_with(stat, tool, files):
             if tool:
+                exe = filemerge._findtool(self.repo.ui, tool)
                 oldmergeenv = os.environ.get('HGMERGE')
-                os.environ['HGMERGE'] = tool
+                os.environ['HGMERGE'] = exe
             resolve(stat, files)
             if tool:
                 if oldmergeenv: