comparison tests/test-permissions.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 f0b13c019b04
children 3053fc33f545
comparison
equal deleted inserted replaced
1660:b2df93c56ac4 1663:d529cdc0a3ee