Allow to specify merge_conflict_style for copy and backport actions

You can now specify the merge_conflict_style options to diff3 to have the conflicting code created using this style.