Issue 17387: Ensure that merged files use LF rather than CRLF. This will hopefully keep th...

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 17387: Ensure that merged files use LF rather than CRLF. This will hopefully keep th... (Closed)

Created:
11 years, 11 months ago by Pam (message me for reviews)

Modified:
9 years, 5 months ago

Reviewers:
ojan

CC:
chromium-reviews_googlegroups.com

Base URL:
svn://chrome-svn/chrome/trunk/src/

Visibility:
Public.

Description

Ensure that merged files use LF rather than CRLF. This will hopefully keep the CRLFs out of our repository, so the Mac andLinux tryservers can apply patches to the files successfully. BUG=6117 TEST=run a WebKit merge using BeyondCompare, and another using kdiff3. Make sure no CRLFs appear in the files checked in. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=7949

Patch Set 1 #

Created: 11 years, 11 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+8 lines, -2 lines)			Patch
	M	webkit/tools/merge/diff3-wrapper.py	View		2 chunks	+8 lines, -2 lines	0 comments	Download

Messages

Total messages: 1 (0 generated)

Expand Messages | Collapse Messages