git_remote_helpers / git / __init__.pyon commit merge overwrites unstaged changes in renamed file (30fd3a5)
   1