tests/test-merge-force.out
author Martin Geisler <mg@lazybytes.net>
Sun, 26 Apr 2009 14:49:49 +0200
changeset 8168 8766fee6f225
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
tests: removed redundant "-u test" from test scripts The tests are executed with a .hgrc file which adds "-u test" by default.

created new head
% 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