tests/test-merge-force.out
author Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Sun, 13 Dec 2009 18:29:16 +0100
changeset 10077 89617aacb495
parent 8545 3682a19bb637
permissions -rw-r--r--
make ui.interactive() return false in case stdin lacks isatty

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