log doc/ja/hgmerge.1.ja.txt @ 2125:3610d9468b1e

age author description
Thu, 03 Nov 2005 11:54:07 +0900 Hidetaka Iwai Fixed wrong encoding of files.
Wed, 02 Nov 2005 16:13:24 -0800 Hidetaka Iwai Added Japanese translations of manpages.