merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t5100 / msg0007
1 Here is an empty patch from A U Thor.
2