log doc/hgmerge.1.txt @ 1559:59b3639df0a9

age author description
Fri, 23 Sep 2005 18:59:16 -0700 Vincent Danjean Fix copyright symbol in docs
Fri, 24 Jun 2005 23:17:10 -0800 mpm Add hgmerge manpage