diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:17:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:17:17 -0700 |
| commit | 6a88021e4675b69b927ce1aa9c4dddc5dc621232 (patch) | |
| tree | f5d564c698d87857c31909c714df3a67365c06b0 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'jk/maint-config-bogus-section' into maint (diff) | |
| parent | t5570: fix forwarding of git-daemon messages via cat (diff) | |
| download | tgif-6a88021e4675b69b927ce1aa9c4dddc5dc621232.tar.xz | |
Merge branch 'js/daemon-test-race-fix' into maint
The test scaffolding for git-daemon was flaky.
By Johannes Sixt
* js/daemon-test-race-fix:
t5570: fix forwarding of git-daemon messages via cat
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions