tests/test-merge4.out
author Martin Geisler <mg@lazybytes.net>
Fri, 12 Mar 2010 00:50:41 +0100
changeset 10660 24555e216af6
parent 6336 4b0c9c674707
permissions -rw-r--r--
Merge with stable

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