diff mercurial/simplemerge.py @ 21968:2167bddc911c stable

i18n-ja: synchronized with f582fa1167f7
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 01 Aug 2014 17:29:02 +0900
parents 4aeb7a6029ba
children f18830651811
line wrap: on
line diff