git_remote_helpers / git / __init__.pyon commit merge-recursive: demonstrate an incorrect conflict with submodule (7d82b06)
   1