Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5322:fb070713ff36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: more robust for damaged indexes - fix flag reporting - make broken length reporting smarter
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Sep 2007 17:14:39 -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