git_remote_helpers / git / __init__.pyon commit merge-recursive: Small cleanups for conflict_rename_rename_1to2 (a99b7f2)
   1