Use the diff3 conflict format.