t / t8005 / euc-japan.txton commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1EUC_JAPAN_NAME="»³ÅÄ ÂÀϺ"
   2EUC_JAPAN_MSG="¥Ö¥ì¡¼¥à¤Î¥Æ¥¹¥È¤Ç¤¹¡£"