Issue 809363002: Parse merge conflict format for multi diffs.

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 809363002: Parse merge conflict format for multi diffs. (Closed)

Created:
6 years ago by ahe

Modified:
6 years ago

Reviewers:
Johnni Winther

CC:
reviews_dartlang.org, kasperl, lukechurch

Base URL:
https://dart.googlecode.com/svn/branches/bleeding_edge

Target Ref:
refs/remotes/trunk

Visibility:
Public.

Created: 6 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+90 lines, -1 line)			Patch
	M	dart/tests/try/poi/source_update.dart	View	1	2 chunks	+41 lines, -1 line	0 comments	Download
	M	dart/tests/try/poi/source_update_test.dart	View	1 2	2 chunks	+49 lines, -0 lines	0 comments	Download

Total messages: 5 (1 generated)

ahe

6 years ago (2014-12-18 11:39:47 UTC) #5

Message was sent while issue was closed.

Committed patchset #3 (id:40001) manually as 42457 (presubmit successful).