Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: clang_format_merge_driver.bat

Issue 2348793003: Introduce git merge driver for the blink reformatting
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « clang_format_merge_driver ('k') | clang_format_merge_driver.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: clang_format_merge_driver.bat
diff --git a/cit.bat b/clang_format_merge_driver.bat
similarity index 63%
copy from cit.bat
copy to clang_format_merge_driver.bat
index a1da0ddc316c6b7c46edf903ca5f74ceda5dc3e8..848724959d35a42dcd0f92420f164dc563dc309a 100755
--- a/cit.bat
+++ b/clang_format_merge_driver.bat
@@ -1,5 +1,5 @@
@echo off
-:: Copyright (c) 2015 The Chromium Authors. All rights reserved.
+:: Copyright 2016 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.
setlocal
@@ -8,4 +8,4 @@ setlocal
PATH=%~dp0;%PATH%
:: Defer control.
-%~dp0python "%~dp0\cit.py" %*
+%~dp0python "%~dp0\clang_format_merge_driver.py" %*
« no previous file with comments | « clang_format_merge_driver ('k') | clang_format_merge_driver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698