[NOT FOR REVIEW] 3-way merge example.

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 3644 matching lines @@
                 'cflags': [
                   '-fomit-frame-pointer',
                 ]
               }],
               ['OS=="android"', {
                 'variables': {
                   'release_optimize%': 's',
                 },
                 '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', {
                 # TODO(thakis): Remove once http://llvm.org/PR20354 is fixed
                 # and the fix is in chromium.
                 'cflags': [ '-fno-slp-vectorize', ],
               }],
               ['profiling==1', {
                 'cflags': [
                   '-fno-omit-frame-pointer',
@@ skipping 2117 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }