tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 17 Jul 2007 09:08:29 -0300
changeset 4895 fa6c9381d053
parent 3592 fffc8a733bf9
permissions -rw-r--r--
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.

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