Default to using --3way when using `git cl patch`.
Resolving conflicts is much more fun this way.
BUG=None
TEST=Ran `git cl patch <issue>` with both clean and unclean patches, also checked behaviour of --reject is preserved.
R=maruel@chromium.org
Review URL: https://codereview.chromium.org/16211005
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@204671 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/git_cl.py b/git_cl.py
index 01fe076..082b4eb 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1692,7 +1692,8 @@
parser.add_option('-f', action='store_true', dest='force',
help='with -b, clobber any existing branch')
parser.add_option('--reject', action='store_true', dest='reject',
- help='allow failed patches and spew .rej files')
+ help='failed patches spew .rej files rather than '
+ 'attempting a 3-way merge')
parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
help="don't commit after patch applies")
(options, args) = parser.parse_args(args)
@@ -1750,6 +1751,8 @@
cmd = ['git', '--no-pager', 'apply', '--index', '-p0']
if options.reject:
cmd.append('--reject')
+ else:
+ cmd.append('--3way')
try:
subprocess2.check_call(cmd, stdin=patch_data, stdout=subprocess2.VOID)
except subprocess2.CalledProcessError: