diff tests/test-merge5.t @ 20308:8862469e16f9 stable 2.9-rc

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:44:01 -0600
parents 41abe2e3e3b7
children fe80fdf68ba7
line wrap: on
line diff