merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t5100 / msg0008
1 >Here is an empty patch from A U Thor.
2
3 Hey you forgot the patch!
4