tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 26 Jul 2007 13:34:36 -0700
changeset 5015 cb100605a516
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert: add 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