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

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

Created:
4 years, 2 months ago by dcheng

Modified:
4 years, 2 months ago

Reviewers:
govind1, Nico

CC:
chromium-reviews, blink-reviews

Target Ref:
refs/pending/branch-heads/2883

Project:
chromium

Visibility:
Public.

Created: 4 years, 2 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+0 lines, -5 lines)			Patch
	M	third_party/WebKit/.gitattributes	View		1 chunk	+0 lines, -5 lines	0 comments	Download

Total messages: 5 (2 generated)

dcheng

As discussed, we'd like to remove the .gitattributes for automated clang-format conflict resolution on the ...

4 years, 2 months ago (2016-10-07 21:04:31 UTC) #2

dcheng

4 years, 2 months ago (2016-10-11 01:23:30 UTC) #5

Message was sent while issue was closed.

Committed patchset #1 (id:1) manually as
a29777b64478fd43de19379003448491ca633894 (presubmit successful).