annotate tests/test-encode.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 1945754e466b
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1258
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
1 %% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
2 %% no changes
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
3 %% uncompressed contents in repo
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
4 this is a test
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
5 %% uncompress our working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
6 this is a test
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
7 %% uncompress our new working dir copy
1945754e466b Add file encoding/decoding support
mpm@selenic.com
parents:
diff changeset
8 this is a test