tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 08 Dec 2006 01:36:50 -0200
changeset 3824 3674ca805a5b
parent 2175 b2ae81a7df29
permissions -rw-r--r--
log: convert branch names to the local encoding

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)