Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-double-merge.out @ 5366:d0c48891dd4a
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 | f191bc3916f7 |
children | 17ed9b9a0d03 |
line wrap: on
line source
resolving manifests overwrite None partial False ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 foo: versions differ -> m foo: remote copied to bar -> m copying foo to bar merging foo and bar my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da merging foo my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -- foo -- line 0 line 1 line 2-1 -- bar -- line 0 line 1 line 2-2