tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 13 Jun 2007 19:15:58 -0300
changeset 4574 b841dc886ba1
parent 3592 fffc8a733bf9
permissions -rw-r--r--
commands.commit: don't use the unknown list

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