log hgmerge @ 1881:4392ccefe432

age author description
Fri, 10 Mar 2006 23:25:50 -0800 Vadim Gelfer undo edit that was accident.
Fri, 10 Mar 2006 22:24:19 -0800 Vadim Gelfer fix broken environment save/restore when a hook runs.
Thu, 23 Feb 2006 18:10:04 +0100 Radoslaw Szkodzinski hgmerge: do not use file with markers in tools merging themselves