tests/test-merge-force.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 14 Mar 2008 09:56:58 -0300
changeset 6255 ae83d927c629
child 6256 69c75d063c7a
permissions -rw-r--r--
add a test for a375ffc2aa1b

% 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