Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 1956:16750010813d
use a proper test instead of catching every exception
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 15 Mar 2006 07:09:42 +0100 |
| parents | c4d577262d00 |
| children | 6a03cff2b0f5 |
comparison
equal
deleted
inserted
replaced
| 1952:f4df34b6987f | 1956:16750010813d |
|---|