diff tests/test-archive @ 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 4603eef60237
children 385b06493465 7d83a351a936
line wrap: on
line diff