Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5366:d0c48891dd4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bdiff: switch to lyhash lyhash is a very simple and fast hash function that had the fewest hash collisions on a 3.9M line text corpus and 190k line binary corpus and should have significantly fewer collisions than the current hash function.
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Sep 2007 23:59:18 -0500
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes