tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 10 Dec 2006 20:35:28 -0200
changeset 3862 46abbed02b2d
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Use UTF-8 in .hg/branch

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