summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:37:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-14 18:37:14 -0700
commit2bbaad82bb4dfd6e7c2f183187fa2a49bc963d7c (patch)
tree567b0806288af4e82e32d3cc23438d6b3e049148 /Documentation/config.txt
parentMerge branch 'pb/opt-cmdmode-doc' into maint (diff)
parentDocumentation: git diff --check detects conflict markers (diff)
downloadtgif-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 'Documentation/config.txt')
0 files changed, 0 insertions, 0 deletions