log doc/hgmerge.1.txt @ 3477:e762c0e95eac

age author description
Sat, 12 Aug 2006 12:30:02 -0700 Vadim Gelfer update copyrights.