Darcs.Patch.ConflictMarking
mangleUnravelled