tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Fri, 06 Jul 2007 10:22:22 -0700
changeset 4834 845e0071b704
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Sort changelog extra dict to avoid possible nondeterminism

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