diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:27:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:27:04 -0700 |
| commit | a4478c9c0319a1d32dc8af76366ef8d855c16ff9 (patch) | |
| tree | 06972420e94aad7a5dc90266028442cf159297ac /merge-recursive.c | |
| parent | Merge branch 'tb/pull-ff-rebase-autostash' into maint (diff) | |
| parent | p0004: don't error out if test repo is too small (diff) | |
| download | tgif-a4478c9c0319a1d32dc8af76366ef8d855c16ff9.tar.xz | |
Merge branch 'jh/memihash-opt' into maint
perf-test update.
* jh/memihash-opt:
p0004: don't error out if test repo is too small
p0004: don't abort if multi-threaded is too slow
p0004: use test_perf
p0004: avoid using pipes
p0004: simplify calls of test-lazy-init-name-hash
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions