git_remote_helpers / git / __init__.pyon commit merge-recursive: Avoid doubly merging rename/add conflict contents (2a669c3)
   1