view tests/test-resolve.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.

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty