summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-07 16:27:53 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-07 16:27:53 +0900
commitbd40f41b7b894f9e9258e15acd3620c71c6c4a67 (patch)
tree427355de00c51692eda264a022a7685d5f8e4124 /Documentation/git-merge-file.txt
parentMerge branch 'jn/strbuf-doc-re-reuse' (diff)
parenttest-stringlist: avoid buffer underrun when sorting nothing (diff)
downloadtgif-bd40f41b7b894f9e9258e15acd3620c71c6c4a67.tar.xz
Merge branch 'rs/qsort-s'
* rs/qsort-s: test-stringlist: avoid buffer underrun when sorting nothing
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions