tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Thu, 30 Nov 2006 13:51:58 -0800
changeset 3726 752884db5037
parent 3592 fffc8a733bf9
permissions -rw-r--r--
transplant: recover added/removed files after failed application

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