comparison tests/test-conflict.t @ 16286:3c147aca78dd stable

i18n-ja: synchronized with 900eee0778d1
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 27 Mar 2012 20:37:52 +0900
parents 2371f4aea665
children 25d5a9ecbb85
comparison
equal deleted inserted replaced
16278:900eee0778d1 16286:3c147aca78dd