Issue 1153013005: Exclude .md files from version control conflict detection.

Issue 1153013005: Exclude .md files from version control conflict detection. (Closed)

Created:
5 years, 6 months ago by Dan Beam

Modified:
5 years, 6 months ago

Reviewers:
cpu_(ooo_6.6-7.5), Jeremy Klein

CC:
chromium-reviews

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

Target Ref:
refs/pending/heads/master

Project:
chromium

Visibility:
Public.

Exclude .md files from version control conflict detection. Turns out top-level headers basically look exactly like a merge conflict marker. R=jlklein@chromium.org BUG=495338 Committed: https://crrev.com/95c35a2fad1b1c077ac233d338ea7e5e94c5315b Cr-Commit-Position: refs/heads/master@{#332313}

Created: 5 years, 6 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+14 lines, -0 lines)			Patch
	M	PRESUBMIT.py	View		1 chunk	+4 lines, -0 lines	0 comments	Download
	M	PRESUBMIT_test.py	View		1 chunk	+10 lines, -0 lines	0 comments	Download

Total messages: 10 (3 generated)

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1153013005/20001

5 years, 6 months ago (2015-06-02 01:12:38 UTC) #8

commit-bot: I haz the power

5 years, 6 months ago (2015-06-02 01:41:29 UTC) #10

Message was sent while issue was closed.

Patchset 1 (id:??) landed as
https://crrev.com/95c35a2fad1b1c077ac233d338ea7e5e94c5315b
Cr-Commit-Position: refs/heads/master@{#332313}