Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3843:abaa2cd00d2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make transcoding more robust default to ASCII abort if unknown encoding wrap abort strings with _ add test
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Dec 2006 12:46:01 -0600
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