git_remote_helpers / git / __init__.pyon commit tests: document format of conflicts from checkout -m (47349a8)
   1