view tests/test-merge4.out @ 10585:37db57bc7fd7 stable

Merge with hg-i18n
author Martin Geisler <mg@lazybytes.net>
date Thu, 04 Mar 2010 10:05:12 +0100
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)