Mercurial > hg

view tests/test-merge5.out @ 4974:a335345100ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: set the threshold for lazy parsing higher A typical machine can parse a 1MB index in well under a second
author Matt Mackall <mpm@selenic.com>
date Mon, 23 Jul 2007 20:44:08 -0500
parents fffc8a733bf9
children 4b0c9c674707
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