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

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)