summaryrefslogtreecommitdiff
path: root/contrib/subtree/todo
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-12-01 23:54:40 (GMT)
committerJeff King <peff@peff.net>2015-12-01 23:54:40 (GMT)
commitfa7095e63d0a9ace33114ebb2736084230e69b7a (patch)
tree934ce03a443524599a2c8d8f918a1b82d9d60519 /contrib/subtree/todo
parente0dd81b08eef72f2554facaf6b494ea8d4a1f3d7 (diff)
parentdfe90e8b528be4d9668b1bdc6329f8227cbf307a (diff)
downloadgit-fa7095e63d0a9ace33114ebb2736084230e69b7a.zip
git-fa7095e63d0a9ace33114ebb2736084230e69b7a.tar.gz
git-fa7095e63d0a9ace33114ebb2736084230e69b7a.tar.bz2
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 'contrib/subtree/todo')
0 files changed, 0 insertions, 0 deletions