diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:13:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:13:56 -0700 |
| commit | 1d9fd6683c44b6e5f9f9990981de70c2a9f83433 (patch) | |
| tree | 75ac6c163cfee80afe25af01b3e643721d233c27 /notes-merge.c | |
| parent | Merge branch 'rt/cherry-revert-conflict-summary' into maint (diff) | |
| parent | git-remote-testgit: fix race when spawning fast-import (diff) | |
| download | tgif-1d9fd6683c44b6e5f9f9990981de70c2a9f83433.tar.xz | |
Merge branch 'pw/t5800-import-race-fix' into maint
The test scaffolding for fast-import was flaky.
By Pete Wyckoff
* pw/t5800-import-race-fix:
git-remote-testgit: fix race when spawning fast-import
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions