summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-28 09:01:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-28 09:01:21 -0700
commitb943a213fe6740f64e2ce3fafebce453814115d9 (patch)
treeb6b0b30cb2e6e433a9928d880da32d045151c1a0 /mergetools/xxdiff
parentMerge branch 'tg/add-chmod+x-fix' into maint (diff)
parenttest-lib: bail out when "-v" used under "prove" (diff)
downloadtgif-b943a213fe6740f64e2ce3fafebce453814115d9.tar.xz
Merge branch 'jk/tap-verbose-fix' into maint
The Travis CI configuration we ship ran the tests with --verbose option but this risks non-TAP output that happens to be "ok" to be misinterpreted as TAP signalling a test that passed. This resulted in unnecessary failure. This has been corrected by introducing a new mode to run our tests in the test harness to send the verbose output separately to the log file. * jk/tap-verbose-fix: test-lib: bail out when "-v" used under "prove" travis: use --verbose-log test option test-lib: add --verbose-log option test-lib: handle TEST_OUTPUT_DIRECTORY with spaces
Diffstat (limited to 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions