clang_format_merge_driver.bat - Issue 2348793003: Introduce git merge driver for the blink reformatting

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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:

OLD	NEW
1 @echo off	1 @echo off

2 :: Copyright (c) 2015 The Chromium Authors. All rights reserved.	2 :: Copyright 2016 The Chromium Authors. All rights reserved.

3 :: Use of this source code is governed by a BSD-style license that can be	3 :: Use of this source code is governed by a BSD-style license that can be

4 :: found in the LICENSE file.	4 :: found in the LICENSE file.

5 setlocal	5 setlocal

6	6

7 :: This is required with cygwin only.	7 :: This is required with cygwin only.

8 PATH=%~dp0;%PATH%	8 PATH=%~dp0;%PATH%

9	9

10 :: Defer control.	10 :: Defer control.

11 %~dp0python "%~dp0\cit.py" %*	11 %~dp0python "%~dp0\clang_format_merge_driver.py" %*

OLD	NEW

« no previous file with comments | « clang_format_merge_driver ('k') | clang_format_merge_driver.py » ('j') | no next file with comments »