summaryrefslogtreecommitdiff
path: root/t/t6427-diff3-conflict-markers.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2022-03-17 11:13:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-17 08:40:26 -0700
commit94945322baf222993d72d472a6d9d8dcb0b35893 (patch)
tree1cfcaf136b818f83e23bafcbe6961e99e08774f6 /t/t6427-diff3-conflict-markers.sh
parenthook tests: turn exit code assertions into a loop (diff)
downloadtgif-94945322baf222993d72d472a6d9d8dcb0b35893.tar.xz
http tests: don't rely on "hook/post-update.sample"
Change code added in a87679339c0 (test: rename http fetch and push test files, 2014-02-06) to stop relying on the "exec git update-server-info" in "templates/hooks--post-update.sample", let's instead inline the expected hook in the test itself. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6427-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions