tests/test-merge5.out
author Eric Hopper <hopper@omnifarious.org>
Thu, 17 May 2007 20:09:49 -0700
changeset 4441 32ea809e5bd1
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Alter test to test import --exact to make sure it works with branches.

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