Mercurial > hg
view tests/test-merge1.out @ 1561:9c6d0abdb94e
disallow '\n' and '\r' in tag names
add a test for disallowed characters in tag names
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 29 Nov 2005 22:29:14 +0100 |
parents | 67a28636ea64 |
children | db10b7114de0 |
line wrap: on
line source
%% no merges expected %% merge of b expected merging for b merging b %% Contents of b should be "this is file b1" This is file b1 %% merge expected! merging for b merging b %% merge of b expected merging for b merging b