annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
1 321
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
2 cat: sub/b: No such file or directory
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
3 ls: sub: No such file or directory