Mercurial > hg > mercurial-crew-with-dirclash
view 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 |
line wrap: on
line source
%% no changes %% no changes %% uncompressed contents in repo this is a test %% uncompress our working dir copy this is a test %% uncompress our new working dir copy this is a test