Merge branch 'en/d-f-conflict-fix'
[git] / t / t4013 / diff.diff-tree_--pretty_-p_initial
1 $ git diff-tree --pretty -p initial
2 $