sapling/tests/test-merge-force.out
2008-03-14 09:56:58 -03:00

10 lines
242 B
Plaintext

% 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