Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 1788:750b9cd83965
change the default timeout to 600 seconds
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 21 Feb 2006 23:50:53 +0100 |
| parents | 4ba8fe499df2 |
| children | 4eea6a747c27 |
comparison
equal
deleted
inserted
replaced
| 1787:e431344e604c | 1788:750b9cd83965 |
|---|