summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
diff options
context:
space:
mode:
authorLibravatar Ramsay Jones <ramsay@ramsay1.demon.co.uk>2010-12-14 18:19:09 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-14 11:07:11 -0800
commitfbbfc8a9bb91ddd325995cc346eab91c06c9cd64 (patch)
tree675c7def3b79087d1218ec6fd6649cbd9127cdf4 /t/t6024-recursive-merge.sh
parentPrepare for 1.7.3.4 (diff)
downloadtgif-fbbfc8a9bb91ddd325995cc346eab91c06c9cd64.tar.xz
t3600-rm.sh: Don't pass a non-existent prereq to test #15
Commit c91cfd19 (tests: A SANITY test prereq for testing if we're root, 2010-08-06) introduced a SANITY prerequisite which had very similar semantics to RO_DIR. That commit removed the code to set RO_DIR, but forgot to replace RO_DIR with SANITY in test #15. In order not to skip test 15 unnecessarily, since RO_DIR will never be set, we pass the SANITY prerequisite instead. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions