view tests/test-merge5.out @ 4436:a764edb6fc95

Add branch information to hg export.
author Eric Hopper <hopper@omnifarious.org>
date Thu, 10 May 2007 13:42:36 -0700
parents fffc8a733bf9
children
line wrap: on
line source

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