summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2009-04-03 15:33:59 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-08 22:42:16 -0700
commit1b19ccd236e3369ac77d74ded207406ffbf9feca (patch)
tree3893ed847c3f7f6c74c7fa7d424d9707f9b64938 /builtin-merge-ours.c
parentMakefile: allow building without perl (diff)
downloadtgif-1b19ccd236e3369ac77d74ded207406ffbf9feca.tar.xz
tests: skip perl tests if NO_PERL is defined
These scripts all test git programs that are written in perl, and thus obviously won't work if NO_PERL is defined. We pass NO_PERL to the scripts from the building Makefile via the GIT-BUILD-OPTIONS file. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions