git_remote_helpers / git / __init__.pyon commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1