Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4895:fa6c9381d053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: manually set encoding to UTF-8 Right now the backends assume we're working in UTF-8 and there's no good way to ignore the encoding when adding revisions.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 17 Jul 2007 09:08:29 -0300
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