Introduce git_merge_file for consumers