tests/test-merge1.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 06 Dec 2005 14:10:38 +0100
changeset 1582 63799b01985c
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
fix the cat command - improve localrepo.walk when passed a node - make the differents walk commands in commands.py accept a node - change commands.cat to walk over a revision - add a test

%% 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