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