third_party/WebKit/.gitattributes - Issue 2404553002: Remove merge rules for //third_party/WebKit from M55 branch.

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: third_party/WebKit/.gitattributes

Issue 2404553002: Remove merge rules for //third_party/WebKit from M55 branch. (Closed)

Patch Set: Created 4 years, 2 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: third_party/WebKit/.gitattributes

diff --git a/third_party/WebKit/.gitattributes b/third_party/WebKit/.gitattributes

index 06f175c4eb155e853d24b9005895a5bb2895c5c7..50bd5ebb52a328989c090580e7c6abf854f15838 100644

--- a/third_party/WebKit/.gitattributes

+++ b/third_party/WebKit/.gitattributes

@@ -1,8 +1,3 @@

# For best performance, place rules for deep paths in the parent directory.

# For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,

# place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes

-# TODO(thakis): Remove this after a while.

-*.cpp merge=clang-format

-*.h merge=clang-format

-*.mm merge=clang-format

« no previous file with comments | « no previous file | no next file » | no next file with comments »