diff options
| -rw-r--r-- | webkit/tools/merge/diff3-wrapper.bat | 2 | ||||
| -rwxr-xr-x | webkit/tools/merge/diff3-wrapper.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/merge/diff3-wrapper.bat b/webkit/tools/merge/diff3-wrapper.bat index 3881884..a818f4e 100644 --- a/webkit/tools/merge/diff3-wrapper.bat +++ b/webkit/tools/merge/diff3-wrapper.bat @@ -6,5 +6,5 @@ :: Wrapper around diff3-wrapper.py so it can be called from svn. -python %~dp0diff3-wrapper.py %* +%~dp0\..\..\..\third_party\python_24\python %~dp0diff3-wrapper.py %* exit /B %ERRORLEVEL% diff --git a/webkit/tools/merge/diff3-wrapper.py b/webkit/tools/merge/diff3-wrapper.py index f5dec9c..04171ad 100755 --- a/webkit/tools/merge/diff3-wrapper.py +++ b/webkit/tools/merge/diff3-wrapper.py @@ -60,7 +60,7 @@ def main(args): diff_tool = args[1]
if diff_tool == "--use-beyondcompare":
- exe = GetPathToBinary("/cygdrive/c/Progra~1/Beyond~1/BComp.exe")
+ exe = GetPathToBinary("c:/Progra~1/Beyond~1/BComp.exe")
cmd = [exe,
mine,
yours,
@@ -76,7 +76,7 @@ def main(args): '/centertitle', title_older,
'/outputtitle', 'merged']
elif diff_tool == "--use-kdiff3":
- exe = GetPathToBinary("/cygdrive/c/Progra~1/KDiff3/kdiff3.exe")
+ exe = GetPathToBinary("c:/Progra~1/KDiff3/kdiff3.exe")
cmd = [exe,
older,
mine,
|