diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-09 00:29:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-09 00:29:13 +0300 |
| commit | b0fbcf0003d87c050a55434eaf74a48ad78cb2a9 (patch) | |
| tree | fd0a1728fc4b6773ab431fd5c187aa3dc67a15c1 /environment.c | |
| parent | 8fdfaf0b2f882dea825f3f9abe92af13c45432a5 (diff) | |
| parent | 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 (diff) | |
Merge branch 'oa/doc-diff-check'
A minor documentation update.
* oa/doc-diff-check:
Documentation: git diff --check detects conflict markers
Diffstat (limited to 'environment.c')
0 files changed, 0 insertions, 0 deletions