##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r8545:3682a19b default
r10276:6109a02c merge default
Show More
test-merge-force.out
11 lines | 332 B | text/plain | TextLexer
/ tests / test-merge-force.out
created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list changes)
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