summaryrefslogtreecommitdiffstats
path: root/webkit/tools/merge/diff3-wrapper.bat
blob: 3881884af7260b429bc2664da4aacf1da5cb1ed6 (plain)
1
2
3
4
5
6
7
8
9
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%