diff tests/test-merge4.t @ 18202:fb0ae4cd706d stable

merge i18n heads
author Matt Mackall <mpm@selenic.com>
date Wed, 02 Jan 2013 00:02:22 -0600
parents 63c817ea4a70
children 8561ad49915d
line wrap: on
line diff