log doc/ja/hgmerge.1.ja.txt @ 5409:190c234c8fa0

age author description
Tue, 19 Jun 2007 08:51:34 +0200 Thomas Arendsen Hein Updated copyright notices and add "and others" to "hg version"