Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl - Issue 20652002: Fix trailing whitespace in scripts and misc. files

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: Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl

Issue 20652002: Fix trailing whitespace in scripts and misc. files (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Don't change literal diff. Created 7 years, 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Tools/Scripts/webkitperl/VCSUtils_unittest/generatePatchCommand.pl ('k') | Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl

diff --git a/Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl b/Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl

index 0c8c89c7a6b7473e614a1dc0a61cf8e05e2cd13f..8bdd2bdde0997ac07fa8f029d8ee8d5e8a88fda1 100644

--- a/Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl

+++ b/Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl

@@ -10,7 +10,7 @@

# 2. Redistributions in binary form must reproduce the above copyright

# notice, this list of conditions and the following disclaimer in the

# documentation and/or other materials provided with the distribution.

# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY

# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

@@ -90,17 +90,17 @@ EOF

***************

*** 1,3 ****

2010-01-29 Simon Hausmann <simon.hausmann@nokia.com>

Rubber-stamped by Maciej Stachowiak.

--- 1,9 ----

+ 2010-01-29 Oliver Hunt <oliver@apple.com>

+ Reviewed by Darin Adler.

+ JSC is failing to propagate anonymous slot count on some transitions

2010-01-29 Simon Hausmann <simon.hausmann@nokia.com>

Rubber-stamped by Maciej Stachowiak.

EOF

my $fileMine = writeTempFile("file", ".rej", $fileMineContent);

@@ -159,17 +159,17 @@ EOF

***************

*** 1,9 ****

- 2010-01-29 Oliver Hunt <oliver@apple.com>

- Reviewed by Darin Adler.

- JSC is failing to propagate anonymous slot count on some transitions

2010-01-29 Simon Hausmann <simon.hausmann@nokia.com>

Rubber-stamped by Maciej Stachowiak.

--- 1,3 ----

2010-01-29 Simon Hausmann <simon.hausmann@nokia.com>

Rubber-stamped by Maciej Stachowiak.

EOF

my $fileMine = writeTempFile("file", ".rej", $fileMineContent);