diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:18:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:18:29 (GMT) |
| commit | 7461a3e9fca9b73e35386a1d8a2de2cf8b444871 (patch) | |
| tree | 632b941b7c4552158583ee9dd99db3e94151fe84 /mergetools | |
| parent | 1265886303778b5a2631c41c6ee61094c5fda7b0 (diff) | |
| parent | 76e7c8a7ed58250bb74cf55618a81baed1797eca (diff) | |
| download | git-7461a3e9fca9b73e35386a1d8a2de2cf8b444871.zip git-7461a3e9fca9b73e35386a1d8a2de2cf8b444871.tar.gz git-7461a3e9fca9b73e35386a1d8a2de2cf8b444871.tar.bz2 | |
Merge branch 'tl/relax-in-poll-emulation'
* tl/relax-in-poll-emulation:
compat/poll: sleep 1 millisecond to avoid busy wait
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions