diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-24 14:36:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-24 14:36:27 -0700 |
| commit | e537784f6454374d61d45e45f5e69fafcde18309 (patch) | |
| tree | f19b1a574b03c9b9c70ca60a3201e302c30c94ab /xdiff/xmerge.c | |
| parent | Merge branch 'tb/geometric-repack' (diff) | |
| parent | t: annotate !PTHREADS tests with !FAIL_PREREQS (diff) | |
| download | tgif-e537784f6454374d61d45e45f5e69fafcde18309.tar.xz | |
Merge branch 'jk/fail-prereq-testfix'
GIT_TEST_FAIL_PREREQS is a mechanism to skip test pieces with
prerequisites to catch broken tests that depend on the side effects
of optional pieces, but did not work at all when negative
prerequisites were involved.
* jk/fail-prereq-testfix:
t: annotate !PTHREADS tests with !FAIL_PREREQS
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions