diff options
Diffstat (limited to 'webkit/tools/merge')
| -rwxr-xr-x | webkit/tools/merge/diff3-wrapper.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/merge/diff3-wrapper.py b/webkit/tools/merge/diff3-wrapper.py index c179358..96e0a74 100755 --- a/webkit/tools/merge/diff3-wrapper.py +++ b/webkit/tools/merge/diff3-wrapper.py @@ -62,6 +62,8 @@ def main(args): if diff_tool == "--use-beyondcompare": exe = GetPathToBinary("c:/Progra~1/Beyond~1/BComp.exe") + if not os.path.exists(exe): + exe = GetPathToBinary("c:/Progra~2/Beyond~1/BComp.exe") cmd = [exe, mine, yours, |