diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 01:57:15 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 01:57:15 +0000 |
| commit | e7955ea7c803fb3a6b1d01736ef09c8639a0e8b8 (patch) | |
| tree | 793761c72289aa0fcda8298362ffee8d1fcf2e25 /webkit/tools/merge | |
| parent | 6df2cfeedf348da8062891e7e008bbcb94816ffb (diff) | |
| download | chromium_src-e7955ea7c803fb3a6b1d01736ef09c8639a0e8b8.zip chromium_src-e7955ea7c803fb3a6b1d01736ef09c8639a0e8b8.tar.gz chromium_src-e7955ea7c803fb3a6b1d01736ef09c8639a0e8b8.tar.bz2 | |
Update the diff3 wrapper to use the checked in
python and use windows paths rather than cygwin
paths because the checked in python doesn't know about
cygwin paths.
Review URL: http://codereview.chromium.org/18680
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/merge')
| -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,
|