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