view tests/test-cat.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 c6ffedc4f11b
children 7544700fd931
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 7040230c159c
1