tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Fri, 01 Dec 2006 13:50:09 -0800
changeset 3752 f902f409cd81
parent 3592 fffc8a733bf9
permissions -rw-r--r--
transplant: "filtering %s\n"

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