diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:14 -0700 |
| commit | 2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c (patch) | |
| tree | 567b0806288af4e82e32d3cc23438d6b3e049148 /alloc.c | |
| parent | 48adfa18bc5c865d72cb9a5d0f2a875d282dafb1 (diff) | |
| parent | 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 (diff) | |
| download | git-2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c.tar.gz | |
Merge branch 'oa/doc-diff-check' into maint
A minor documentation update.
* oa/doc-diff-check:
Documentation: git diff --check detects conflict markers
Diffstat (limited to 'alloc.c')
0 files changed, 0 insertions, 0 deletions