diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:28 -0700 |
commit | 6be44b59fc5e957b9d6e25b32b0fc38c45d50f3f (patch) | |
tree | c1c1944bbd879597de8c6cc5f11119304678b0ce /merge-recursive.h | |
parent | Merge branch 'rs/remote-mv-leakfix' (diff) | |
parent | travis-ci: include the trash directories of failed tests in the trace log (diff) | |
download | tgif-6be44b59fc5e957b9d6e25b32b0fc38c45d50f3f.tar.xz |
Merge branch 'sg/travis-retrieve-trash-upon-failure'
The Travis CI scripts were taught to ship back the test data from
failed tests.
* sg/travis-retrieve-trash-upon-failure:
travis-ci: include the trash directories of failed tests in the trace log
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions