diff tests/test-merge1.t @ 24888:759d8bfa1abe stable

i18n-ja: synchronized with 194207694def
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 30 Apr 2015 19:12:28 +0900
parents 94c394653b2a
children 1ef96a3b8b89
line wrap: on
line diff