diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:46 -0700 |
| commit | 71e36361bfc535deddfba1403a52f02fd24b2340 (patch) | |
| tree | d62fbfe3ab10825a2772dc3feedbb778df8a18ab /merge-recursive.c | |
| parent | 2a6d0b2b6879f01bd4e0f9f41ce8f6d7990c61a5 (diff) | |
| parent | e8f55568de602630e0ce60f7863bdaeeea26c1c0 (diff) | |
Merge branch 'jk/t5562-racefix'
Test update.
* jk/t5562-racefix:
t5562: use alarm() to interrupt timed child-wait
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions