summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-02-13 20:21:14 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-13 10:10:00 -0800
commit0232852b06cb000a3b1f5f48676c8b4d084f18ea (patch)
tree46c0157b3ff7ab8369cdc8c39a1402770e482096 /merge-recursive.c
parentfetch-pack: fix deepen shallow over smart http with no-done cap (diff)
downloadtgif-0232852b06cb000a3b1f5f48676c8b4d084f18ea.tar.xz
t5537: move http tests out to t5539
start_httpd is supposed to be at the beginning of the test file, not the middle of it. The "test_seq" line in "no shallow lines.." test is updated to compensate missing refs that are there in t5537, but not in the new t5539. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions