log hgmerge @ 1701:4ba8fe499df2

age author description
Mon, 06 Feb 2006 17:32:10 -0600 Radoslaw Szkodzinski hgmerge: various cleanups