tests/test-merge4.out
author Martin Geisler <mg@lazybytes.net>
Fri, 16 Jul 2010 14:44:30 +0200
branchstable
changeset 11600 76454cbc11e4
parent 6336 4b0c9c674707
permissions -rw-r--r--
mark ui.warn strings for translation

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)