tests/test-merge5.out
author Daniel Holth <dholth@fastmail.fm>
Wed, 16 May 2007 01:07:27 -0400
changeset 4446 1b75e0eff532
parent 3592 fffc8a733bf9
permissions -rw-r--r--
document conversion interface

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