tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Thu, 06 Sep 2007 18:12:36 -0700
changeset 5286 cbec83d9b0b4
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Update test-record for 3ef190234b55

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