tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 26 Nov 2007 14:01:31 -0800
changeset 5553 ee80591f5636
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
convert: save hg revision during a convert This breaks hg->hg hash roundtripping, but that was fragile, didn't work reliably, and hence arguably of little value.

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