diff tests/test-merge7.t @ 13171:b546db00cfd7

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Mon, 20 Dec 2010 12:08:56 -0600
parents 4134686b83e1
children ec5886db9dc6
line wrap: on
line diff