Fix incorrect merge choices
authorisaacs <i@izs.me>
Sat, 5 May 2012 00:14:09 +0000 (17:14 -0700)
committerisaacs <i@izs.me>
Sat, 5 May 2012 00:24:21 +0000 (17:24 -0700)
commitcd8f82c007bf316fcd857da1e00bfe358df7af44
tree5c99399b489495ebbd3c81a7b8a71323a38e00d8
parent01d146c29f318fb3dce485e49c2541f53dc4a952
Fix incorrect merge choices
lib/http.js
test/gc/test-http-client-timeout.js