Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 4013:54fa628b8c78
catch socket.error
fix issue394
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 29 Dec 2006 06:08:46 +0100 |
| parents | c0a12e6441a5 |
| children | 1e0b94cfba0e c95060a5391a |
comparison
equal
deleted
inserted
replaced
| 4012:d1e31d7f7d44 | 4013:54fa628b8c78 |
|---|