diff tests/test-simple-update @ 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 0902ffece4b4
children ad3d5b4367cb
line wrap: on
line diff