diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:41 -0700 |
| commit | 89d1b573d73e7c93f2190a08ed9430f42104c10b (patch) | |
| tree | 91c7008d4cf4b220f437315534f60784bb4424c1 /builtin/merge.c | |
| parent | 000bce0ee4d0ef719b84fb643c45fe68fa4bb773 (diff) | |
| parent | dfe1a17df9b1bd9ab95095e248b8f376637ac395 (diff) | |
Merge branch 'ab/fail-prereqs-in-test'
Developer support to emulate unsatisfied prerequisites in tests to
ensure that the remainer of the tests still succeeds when tests
with prerequisites are skipped.
* ab/fail-prereqs-in-test:
tests: add a special setup where prerequisites fail
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions