diff tests/test-merge9.t @ 18578:7511d4df752e stable 2.5.1

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Feb 2013 22:58:58 +0000
parents f2719b387380
children 9209c02f1f25
line wrap: on
line diff