t / t8005 / euc-japan.txton commit tests: document cherry-pick behavior in face of conflicts (6a84334)
   1EUC_JAPAN_NAME="»³ÅÄ ÂÀϺ"
   2EUC_JAPAN_MSG="¥Ö¥ì¡¼¥à¤Î¥Æ¥¹¥È¤Ç¤¹¡£"