log doc/hgmerge.1.txt @ 4679:826659bd8053

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