diff tests/test-copy2.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 19b048da4da9
children f4dece0f7016
line wrap: on
line diff