Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1 @ 1663:d529cdc0a3ee
return a non-zero exit code when a merge failed
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 30 Jan 2006 12:02:06 +1300 |
parents | db10b7114de0 |
children | 7544700fd931 |