merge-recursive: match the unmerged index entry behaviour with merge-resolve