diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 22:35:13 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 22:35:13 +0000 |
| commit | 395adbffce5298d3b1b381066945b94dab4cae6e (patch) | |
| tree | 4341a2761ff679d8a1cb632462f1448d86b8a133 /webkit/tools/merge | |
| parent | fea8fff1afad9637caf771fc75c14ac2a366a9db (diff) | |
| download | chromium_src-395adbffce5298d3b1b381066945b94dab4cae6e.zip chromium_src-395adbffce5298d3b1b381066945b94dab4cae6e.tar.gz chromium_src-395adbffce5298d3b1b381066945b94dab4cae6e.tar.bz2 | |
Make merge script work with BeyondCompare on Vista64. BComp.exe is installed
under C:\Program Files (x86) instead.
R=dglazkov
Review URL: http://codereview.chromium.org/25001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9431 0039d316-1c4b-4281-b951-d872f2087c98
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, |