From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:37:14 +0000 (-0700)
Subject: Merge branch 'oa/doc-diff-check' into maint
X-Git-Tag: v2.8.2~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c

Merge branch 'oa/doc-diff-check' into maint

A minor documentation update.

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

2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c