diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 11:53:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 11:53:45 -0700 |
commit | 0ca416f166df7e96d9115a1fe213720f09a1417b (patch) | |
tree | f2e86dbc3c9e7f8b45a0588ed4f97be4afd930c4 /merge-recursive.c | |
parent | ce5cf6ffc6feb9fb4f9a50cdfa2f527fa119c94f (diff) | |
parent | d87bd7c15beb688294cf4adb1b719dc4e413c58f (diff) | |
download | git-0ca416f166df7e96d9115a1fe213720f09a1417b.tar.gz |
Merge branch 'rj/tap-fix'
* rj/tap-fix:
test-lib.sh: Suppress the "passed all ..." message if no tests run
test-lib.sh: Add check for invalid use of 'skip_all' facility
test-lib.sh: Fix some shell coding style violations
t4016-*.sh: Skip all tests rather than each test
t3902-*.sh: Skip all tests rather than each test
t3300-*.sh: Fix a TAP parse error
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions