diff tests/test-merge8.out @ 9564:bc0f62ea2eca

Merge with hg-i18n-stable
author Martin Geisler <mg@lazybytes.net>
date Mon, 28 Sep 2009 00:45:47 +0200
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line diff