diff tests/test-merge4.out @ 9505:28b089ae4001

Merge with i18n-stable
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Sep 2009 13:15:18 -0500
parents 4b0c9c674707
children
line wrap: on
line diff