view tests/test-merge-force.out @ 11707:13d79a7bf5b7 stable

runrst: try to be more helpful if docutils is not installed
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Fri, 30 Jul 2010 14:41:47 +0900
parents 3682a19bb637
children
line wrap: on
line source

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