Issue 1814413002: Fix incorrect merge due to drover choosing pre-conflict version :/

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 1814413002: Fix incorrect merge due to drover choosing pre-conflict version :/ (Closed)

Created:
4 years, 9 months ago by DaleCurtis

Modified:
4 years, 9 months ago

Reviewers:

CC:
chromium-reviews

Base URL:
https://chromium.googlesource.com/chromium/src.git@2661

Target Ref:
refs/pending/branch-heads/2661

Project:
chromium

Visibility:
Public.

Fix incorrect merge due to drover choosing pre-conflict version :/ BUG=592186 TEST=none (cherry picked from commit 01adeb3d793f14db63a3c9fdf5aff1d417a63522) Committed: https://chromium.googlesource.com/chromium/src/+/af84bda50c0bcf609a0e22cad7269bc7e34e0592

Created: 4 years, 9 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+2 lines, -4 lines)			Patch
	M	media/blink/webmediaplayer_impl.cc	View		1 chunk	+2 lines, -4 lines	0 comments	Download

Total messages: 2 (1 generated)

DaleCurtis

4 years, 9 months ago (2016-03-19 00:03:19 UTC) #2

Message was sent while issue was closed.

Committed patchset #1 (id:1) manually as
af84bda50c0bcf609a0e22cad7269bc7e34e0592 (tree was closed).