log doc/hgmerge.1.txt @ 1279:8ab1c07d4e0b

age author description
Fri, 24 Jun 2005 23:17:10 -0800 mpm Add hgmerge manpage