Issue 15786008: Revert 204671 "Default to using --3way when using `git cl patch`."

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 15786008: Revert 204671 "Default to using --3way when using `git cl patch`." (Closed)

Created:
7 years, 6 months ago by tapted

Modified:
7 years, 6 months ago

Reviewers:
tapted

CC:
chromium-reviews

Base URL:
svn://svn.chromium.org/chrome/

Visibility:
Public.

Revert 204671 "Default to using --3way when using `git cl patch`." > 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 TBR=tapted@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=204978

Created: 7 years, 6 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+1 line, -4 lines)			Patch
	M	trunk/tools/depot_tools/git_cl.py	View		2 chunks	+1 line, -4 lines	0 comments	Download

Total messages: 2 (0 generated)

Message was sent while issue was closed.

Committed patchset #1 manually as r204978.