xdl_merge(): add optional ancestor label to diff3-style output