log doc/ja/hgmerge.1.ja.txt @ 3615:1d2fdea875bc

age author description
Sat, 12 Aug 2006 12:30:02 -0700 Vadim Gelfer update copyrights.
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.