view tests/test-merge-force.out @ 11050:5d35f7d93514

commands: refactor diff --stat and qdiff --stat

`opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.

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