tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 10 Oct 2007 15:48:08 -0700
changeset 5438 a19167001251
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-convert-darcs: don't let $HOME/.darcs pollute the test environment

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