tests/test-merge-force.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 24 Aug 2008 22:13:39 +0200
changeset 6934 abb915d9d8db
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
Backed out changeset d557749c627a Replace this change with a better one.

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