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

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

run merge program in repo root....
run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.
Matt Mackall - - Load All Authors

File last commit:

r1449:30146be3 default
r1885:c4d57726 default
Show More
test-confused-revert.out
17 lines | 296 B | text/plain | TextLexer
/ tests / test-confused-revert.out
History | Annotation | Raw |Copy content |Copy permalink
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b