tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Wed, 01 Aug 2007 11:37:11 -0700
changeset 5042 58006f8b8275
parent 3592 fffc8a733bf9
permissions -rw-r--r--
imerge extension and 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