tests/test-merge4.out
author Martin Geisler <mg@lazybytes.net>
Sun, 14 Feb 2010 17:09:52 +0100
branchstable
changeset 10471 132eb7128ad5
parent 6336 4b0c9c674707
permissions -rw-r--r--
progress: use inline literals in help string

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)