log hgmerge @ 1838:429bf036f2cb

age author description
Thu, 23 Feb 2006 18:10:04 +0100 Radoslaw Szkodzinski hgmerge: do not use file with markers in tools merging themselves