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 /t/t6023-merge-file.sh | |
| parent | Merge branch 'pb/opt-cmdmode-doc' into maint (diff) | |
| parent | Documentation: git diff --check detects conflict markers (diff) | |
| download | tgif-2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c.tar.xz | |
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 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions