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

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

Unified Diff: clang_format_merge_driver

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:

Index: clang_format_merge_driver

diff --git a/git-hyper-blame b/clang_format_merge_driver

similarity index 62%

copy from git-hyper-blame

copy to clang_format_merge_driver

index 4abb969a88c3addb8a050e7c6442c5842c2c3150..8b79049469ca357d2c06571f7ce296481e7b295e 100755

--- a/git-hyper-blame

+++ b/clang_format_merge_driver

@@ -3,4 +3,6 @@

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

# found in the LICENSE file.

-. $(type -P python_runner.sh)

+base_dir=$(dirname "$0")

+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/clang_format_merge_driver.py" "$@"

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