git_remote_helpers / git / __init__.pyon commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1