From 5752b6ba9850f6479f5d1e1f6b78d92116591434 Mon Sep 17 00:00:00 2001 From: "pamg@google.com" Date: Thu, 18 Dec 2008 19:10:06 +0000 Subject: Add a .bat script wrapper for the Python diff3 wrapper so it can be called successfully from svn in Cygwin. (Some people were able to use the .py wrapper directly, but I can't. I suspect it has to do with file mappings in Windows.) Change merge.py to use the .bat script, add an --svn option to specify the path to the right svn executable, and strip trailing whitespace. Review URL: http://codereview.chromium.org/14830 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7241 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/merge/diff3-wrapper.bat | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 webkit/tools/merge/diff3-wrapper.bat (limited to 'webkit/tools/merge/diff3-wrapper.bat') diff --git a/webkit/tools/merge/diff3-wrapper.bat b/webkit/tools/merge/diff3-wrapper.bat new file mode 100644 index 0000000..3881884 --- /dev/null +++ b/webkit/tools/merge/diff3-wrapper.bat @@ -0,0 +1,10 @@ +@ECHO off + +:: Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +:: Use of this source code is governed by a BSD-style license that can be +:: found in the LICENSE file. + +:: Wrapper around diff3-wrapper.py so it can be called from svn. + +python %~dp0diff3-wrapper.py %* +exit /B %ERRORLEVEL% -- cgit v1.1