##// END OF EJS Templates
add a test for a375ffc2aa1b
add a test for a375ffc2aa1b

File last commit:

r6255:ae83d927 default
r6255:ae83d927 default
Show More
test-merge-force.out
9 lines | 242 B | text/plain | TextLexer
/ tests / test-merge-force.out
% local deleted a file, remote removed
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b