tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 13 Mar 2007 15:02:33 -0300
changeset 4204 f9bbcebcacea
parent 3592 fffc8a733bf9
permissions -rw-r--r--
"default" is the default branch name

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