view tests/test-empty-dir.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 5a034646e472
children ba198d17eea9
line wrap: on
line source

321
cat: sub/b: No such file or directory
ls: sub: No such file or directory