##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fix the cat command...
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
Benoit Boissinot - - Load All Authors

File last commit:

r1581:db10b711 default
r1582:63799b01 default
Show More
test-merge1.out
13 lines | 220 B | text/plain | TextLexer
/ tests / test-merge1.out
History | Annotation | Raw |Copy content |Copy permalink
%% 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