diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:13 -0700 |
| commit | b8f7239058e6f7c8bb68bd4276ff797d83e03229 (patch) | |
| tree | 347c0e84382ea0a5e88b56a02746862d260bcb55 /mergetools/gvimdiff3 | |
| parent | 08fd8a055cd11291020bf8c6f83d27cdc55df419 (diff) | |
| parent | 6c71f8b0d3d39beffe050f92f33a25dc30dffca3 (diff) | |
| download | git-b8f7239058e6f7c8bb68bd4276ff797d83e03229.tar.gz | |
Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint
* et/spell-poll-infinite-with-minus-one-only:
upload-pack: keep poll(2)'s timeout to -1
Diffstat (limited to 'mergetools/gvimdiff3')
0 files changed, 0 insertions, 0 deletions