log doc/hgmerge.1.txt @ 4650:15e22b483adc

age author description
Tue, 19 Jun 2007 08:51:34 +0200 Thomas Arendsen Hein Updated copyright notices and add "and others" to "hg version"
Sat, 12 Aug 2006 12:30:02 -0700 Vadim Gelfer update copyrights.
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