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

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)