tests/test-merge-force.out
author Brodie Rao <me+hg@dackz.net>
Mon, 10 Aug 2009 22:59:29 +0200
changeset 9330 be2a13153372
parent 8545 3682a19bb637
permissions -rw-r--r--
diffstat: scale adds/removes proportionally to graph width The previous method of scaling had a tendency to include graph lines that went past the output width when the file with the most changes had a very large number of changes.

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