Merge branch 'et/win32-poll-timeout'
commit8d45eefe3ee6bf8499221761df1ee80ead2c8fc0
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:29:02 +0000 (17 12:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2015 19:29:02 +0000 (17 12:29 -0700)
treea24c4fa5f09468873c350dce65ce8d51d9789a8f
parent1c1fee746eb074a80f7dd3c02de286587bac90da
parentef8b53e78c534d732fe58a46da8dbd922287a56b
Merge branch 'et/win32-poll-timeout'

* et/win32-poll-timeout:
  poll: honor the timeout on Win32