summaryrefslogtreecommitdiffstats
path: root/webkit/tools/merge/diff3-wrapper.py
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/merge/diff3-wrapper.py')
-rwxr-xr-xwebkit/tools/merge/diff3-wrapper.py4
1 files changed, 2 insertions, 2 deletions
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,