Mercurial > hg
view tests/test-resolve.out @ 8296:908c5906091b
util: remove md5
This hash function is broken and should not be used by new code. It is
currently only used by keepalive.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 04 May 2009 21:30:39 +0200 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
line wrap: on
line source
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