Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 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 | 3b1b44b917f4 |
children | dee55c4a4963 |