view tests/test-merge-force.out @ 9462:1f54b1b7122f

test-keyword: run kwdemo before setting up [keyword] files

kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.

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