Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 3608:802da51cab5b
Use httpconnection even with proxies.
This should give us HTTP keepalive when we talk to proxies and
should allow us to stream a file in unbundle (instead of
reading everything into a string).
This should fix issue376.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Wed, 01 Nov 2006 14:53:11 -0300 |
| parents | 9bfb3c049b2a |
| children | 3109f012c305 |
comparison
equal
deleted
inserted
replaced
| 3607:f4c9bb4ad7b1 | 3608:802da51cab5b |
|---|