Merge branch 'jk/add-p-skip-conflicts'
[git] / t / t4013 / diff.diff-tree_--pretty_initial
1 $ git diff-tree --pretty initial
2 $