summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Luke Diamand <luke@diamand.org>2015-04-28 08:21:22 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-28 12:16:01 -0700
commit896e700ad92890b59568a52b88e9bd22eec6f9e7 (patch)
tree896bad0a030cfaf77f90618972aeac40be19e159 /t/t6023-merge-file.sh
parentt9814: guarantee only one source exists in git-p4 copy tests (diff)
downloadtgif-896e700ad92890b59568a52b88e9bd22eec6f9e7.tar.xz
git-p4: t9814: prevent --chain-lint failure
Use test_lazy_prereq to setup prerequisites for the p4 move test. This both makes the test simpler and clearer, and also means it no longer fails the new --chain-lint tests. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions