tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 25 Oct 2006 08:11:17 +0200
changeset 3510 e1421a77427e
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
Corrected synopsis of hg heads

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)