Andrew's git / gitweb.git / diff
?
Merge branch 'oa/doc-diff-check' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)
A minor documentation update.

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

Trivial merge