git-merge-recursive: learn to honor merge.conflictstyle
[git] / t / t5100 / patch0007