view tests/test-merge-force.out @ 8281:3e1e499db9d7

util: initialize md5 and sha1 without using extra global variables

This lets the functions skip the "if _sha1 is None" test on each call.

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted 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