merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t5100 / msg0009
1 This is to fix diff-format documentation.
2