git_remote_helpers / git / __init__.pyon commit merge-file: add option to specify the marker size (11f3aa2)
   1