Merge branch 'oa/doc-diff-check' into maint
A minor documentation update. * oa/doc-diff-check: Documentation: git diff --check detects conflict markers
Junio C Hamano committed
Apr 14, 2016 at 18:37 UTC
2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c
No changes.