git-merge-recursive: learn to honor merge.conflictstyle
[git] / t / t4013 / diff.diff-tree_master
1 $ git diff-tree master
2 $