log

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