Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge2 @ 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 | 0902ffece4b4 |
children | 7544700fd931 |