t / t8005 / sjis.txton commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1SJIS_NAME="\8eR\93c \91¾\98Y"
   2SJIS_MSG="\83u\83\8c\81[\83\80\82Ì\83e\83X\83g\82Å\82·\81B"