view tests/test-merge4.out @ 10743:5303b56eabc9

Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 19 Mar 2010 16:04:49 -0500
parents 4b0c9c674707
children
line wrap: on
line source

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)