diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:34 -0800 |
| commit | f0f493ec58489c739839e8d257a04159889639c6 (patch) | |
| tree | 90075c9d900686b3a75e99c592b7099aa5f0bba5 /builtin/merge-file.c | |
| parent | Merge branch 'bm/merge-base-octopus-dedup' (diff) | |
| parent | t0000: drop "known breakage" test (diff) | |
| download | tgif-f0f493ec58489c739839e8d257a04159889639c6.tar.xz | |
Merge branch 'jk/test-framework-updates'
The basic test used to leave unnecessary trash directories in the
t/ directory.
* jk/test-framework-updates:
t0000: drop "known breakage" test
t0000: simplify HARNESS_ACTIVE hack
t0000: set TEST_OUTPUT_DIRECTORY for sub-tests
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions