log hgmerge @ 5008:3addf4531643

age author description
Sun, 08 Jul 2007 13:44:41 +0200 Thomas Arendsen Hein Check for conflict markers in hgmerge (issue471)