log hgmerge @ 270:5a80ed2158c8

age author description
Fri, 03 Jun 2005 18:42:53 -0800 mpm hgmerge: use diff3 if available
Fri, 03 Jun 2005 18:27:55 -0800 mpm Replace tkmerge with hgmerge