tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Wed, 30 Dec 2009 14:32:37 -0600
changeset 10171 542279f81203
parent 6336 4b0c9c674707
permissions -rw-r--r--
Merge with i18n

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)