tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Thu, 30 Nov 2006 11:09:25 -0800
changeset 3724 ea523d6f5f1a
parent 3592 fffc8a733bf9
permissions -rw-r--r--
transplant: fix --continue; add --continue test

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