Remove the now unneeded diff markers.