tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5381 6874368120dc
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
convert_cvs: add --filemap support

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