diff options
| author |  Jeff King <peff@peff.net> | 2015-12-01 18:54:40 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 18:54:40 -0500 |
| commit | fa7095e63d0a9ace33114ebb2736084230e69b7a (patch) | |
| tree | 934ce03a443524599a2c8d8f918a1b82d9d60519 /t/t7602-merge-octopus-many.sh | |
| parent | Merge branch 'js/test-modernize-t9300' (diff) | |
| parent | git-p4: add trap to kill p4d on test exit (diff) | |
| download | tgif-fa7095e63d0a9ace33114ebb2736084230e69b7a.tar.xz | |
Merge branch 'ls/p4-test-timeouts'
Work around some test flakiness with p4d.
* ls/p4-test-timeouts:
git-p4: add trap to kill p4d on test exit
git-p4: add p4d timeout in tests
git-p4: retry kill/cleanup operations in tests with timeout
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions