log hgmerge @ 1884:4e44ca05a866

age author description
Fri, 10 Mar 2006 23:34:36 -0800 Vadim Gelfer merge with self.
Fri, 10 Mar 2006 23:34:02 -0800 Vadim Gelfer give more info to hgmerge script.
Fri, 10 Mar 2006 23:25:50 -0800 Vadim Gelfer undo edit that was accident.