summaryrefslogtreecommitdiff
path: root/test-mergesort.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-02 12:53:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-02 12:53:05 -0700
commita02ad882a17b9d45f63ea448391ac5e9f7948222 (patch)
tree4c48e769c8f8556a24f10db4a892889d154623b0 /test-mergesort.c
parentMerge branch 'bc/fix-rebase-merge-skip' (diff)
parenthttp: fix charset detection of extract_content_type() (diff)
downloadtgif-a02ad882a17b9d45f63ea448391ac5e9f7948222.tar.xz
Merge branch 'ye/http-extract-charset'
* ye/http-extract-charset: http: fix charset detection of extract_content_type()
Diffstat (limited to 'test-mergesort.c')
0 files changed, 0 insertions, 0 deletions