Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/hg.py @ 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 | c81d264cd17d |
children | dec6d3c13dbf |