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

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

Show reason why an ignore file can't be read and state that it is skipped.
Show reason why an ignore file can't be read and state that it is skipped.
Matt Mackall - - Load All Authors

File last commit:

r1449:30146be3 default
r2006:ff8b39da 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