tests/test-merge-force.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 14 Feb 2010 18:39:16 +0100
branchstable
changeset 10469 b26c4a89a143
parent 8545 3682a19bb637
permissions -rw-r--r--
Fix test-push-validation under Windows

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