Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4131:1ca664c964e0
don't return uninitialized memory from bdiff.blocks()
bdiff.blocks() returns a dummy match at the end of both files; the
length of that chunk is never set, so it will sometimes contain random
heap garbage. There are apparently workarounds for this elsewhere:
# bdiff sometimes gives huge matches past eof, this check eats them,
author | Erling Ellingsen <erlingalf@gmail.com> |
---|---|
date | Tue, 20 Feb 2007 22:20:16 +0100 |
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