diff i18n/ja.po @ 22895:dfa44e25bb53

dirstate: properly clean-up some more merge state on setparents
author Matt Mackall <mpm@selenic.com>
date Fri, 10 Oct 2014 13:05:50 -0500
parents 77f3c3c5d4a1
children 2b7c8decca51
line wrap: on
line diff