tests/test-merge-force.out
author Martin Geisler <mg@lazybytes.net>
Sun, 26 Jul 2009 01:59:59 +0200
changeset 9271 4ea022359c43
parent 8545 3682a19bb637
permissions -rw-r--r--
rebase: wrap docstrings at 70 characters

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