summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2010-10-14 10:53:36 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-26 11:25:48 -0700
commit28d836c81586e6b49131c69bbc5228a41667f1da (patch)
treeb3624ff4cf45cef1111a0667c6e99134dc54def8 /merge-recursive.h
parentSync with 1.7.3.2 (diff)
downloadtgif-28d836c81586e6b49131c69bbc5228a41667f1da.tar.xz
test: allow running the tests under "prove"
You can run "make DEFAULT_TEST_TARGET=prove test" to run the test under "prove" (or $(PROVE) if set). The output is a bit easier to read when running many tests in parallel. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Liked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Liked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions