Merge branch 'oa/doc-diff-check'
A minor documentation update. * oa/doc-diff-check: Documentation: git diff --check detects conflict markers
Junio C Hamano committed
Apr 8, 2016 at 14:29 UTC
b0fbcf0003d87c050a55434eaf74a48ad78cb2a9
No changes.