tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Fri, 13 Jul 2007 08:28:57 -0700
changeset 4873 28b23b9073a8
parent 2175 b2ae81a7df29
permissions -rw-r--r--
convert: record the source revision in the changelog

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)