Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4703:bc63247c66e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: improve shortlog formatting shorten author with |person don't shrink font (default font is presumed to be preferred reading size) set widths based on font ems rather than page percents.
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Jun 2007 11:30:05 -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