tests/test-merge-force.out
author Matt Mackall <mpm@selenic.com>
Thu, 20 Mar 2008 14:14:15 -0500
changeset 6328 991f7518c3f3
parent 6256 69c75d063c7a
child 6336 4b0c9c674707
permissions -rw-r--r--
tests: remove some unnecessary sleeps

% local deleted a file, remote removed
abort: outstanding uncommitted 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