merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t4013 / diff.diff-tree_-p_initial
1 $ git diff-tree -p initial
2 $