comparison tests/test-merge6.t @ 21213:004267ce0338 stable

merge with i18n
author Matt Mackall <mpm@selenic.com>
date Thu, 01 May 2014 13:42:12 -0500
parents f2719b387380
children 2428e8ec0793
comparison
equal deleted inserted replaced
21210:799c494189a9 21213:004267ce0338