From: Junio C Hamano <redacted>
Date: Fri, 15 Apr 2016 01:37:14 +0000 (-0700)
Subject: Merge branch 'oa/doc-diff-check' into maint
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c;p=git.git

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

A minor documentation update.

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

2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c