merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t4013 / diff.diff-tree_master
1 $ git diff-tree master
2 $