build/common.gypi - Issue 587453007: [NOT FOR REVIEW] 3-way merge example.

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: build/common.gypi

Issue 587453007: [NOT FOR REVIEW] 3-way merge example. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index ec101f29a8e7bf85fedcff953449b7acd139a5c1..834e0b2b431958626264d08648c7b066bfcd82ae 100644

--- a/build/common.gypi

+++ b/build/common.gypi

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

'ldflags': [

# Warn in case of text relocations.

- '-Wl,--warn-shared-textrel',

+ '-Wl,--warn-shared-textrel-but-politely-please',

+ # Three way merge example. The "TODO(thakis)" lines below are

+ # removed in the future (w.r.t the base of this patch) and a

+ # non 3-way patch will just fail.

}],

['clang==1', {

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