| commit | b0fbcf0003d87c050a55434eaf74a48ad78cb2a9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 8 Apr 2016 21:29:13 +0000 (8 14:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 8 Apr 2016 21:29:13 +0000 (8 14:29 -0700) | ||
| tree | fd0a1728fc4b6773ab431fd5c187aa3dc67a15c1 | treesnapshot (tar.gz zip) |
| parent | 8fdfaf0b2f882dea825f3f9abe92af13c45432a5 | commitdiff |
| parent | 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 | commitdiff |
Merge branch 'oa/doc-diff-check'
A minor documentation update.
* oa/doc-diff-check:
Documentation: git diff --check detects conflict markers
A minor documentation update.
* oa/doc-diff-check:
Documentation: git diff --check detects conflict markers