git_remote_helpers / git / __init__.pyon commit t3508 (cherry-pick): futureproof against unmerged files (18c8ff4)
   1