[[ Bug 13139 ]] Incorrect parsing of <? segments in merge