From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 Apr 2016 21:29:13 +0000 (-0700)
Subject: Merge branch 'oa/doc-diff-check'
X-Git-Tag: v2.9.0-rc0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0fbcf0003d87c050a55434eaf74a48ad78cb2a9;p=thirdparty%2Fgit.git

Merge branch 'oa/doc-diff-check'

A minor documentation update.

* oa/doc-diff-check:
  Documentation: git diff --check detects conflict markers
---

b0fbcf0003d87c050a55434eaf74a48ad78cb2a9