view tests/test-merge1.out @ 1582:63799b01985c

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