tests/test-merge5.out
author Eric Hopper <hopper@omnifarious.org>
Tue, 19 Jun 2007 08:37:41 -0700
changeset 4647 7c80e3e6f030
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Provide a version independent way to use the set datatype.

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