tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 10 Oct 2007 15:30:00 -0700
changeset 5435 d0c67b52ac01
parent 3592 fffc8a733bf9
permissions -rw-r--r--
convert: make contents of "extra" dict available from sources, for sinks. This breaks hash preservation for hg->hg conversion, as each converted change gets a convert_revision item added to its extra dict. Ugh.

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