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

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

Fix up copy command to behave more like regular "cp"....
Fix up copy command to behave more like regular "cp". In addition to recording changes, copy now updates the working directory.
mpm@selenic.com - - Load All Authors

File last commit:

r1236:67a28636 default
r1249:a5355fa5 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