comparison tests/test-simplemerge.py @ 18024:87e00472546a stable

i18n-ja: synchronized with f94ead934067
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 30 Nov 2012 21:39:01 +0900
parents d08b333816c6
children f18830651811
comparison
equal deleted inserted replaced
17985:f94ead934067 18024:87e00472546a