Merge branch 'jk/rebase-i-submodule-conflict-only'
[git] / t / t4013 / diff.diff-tree_--pretty=oneline_initial
1 $ git diff-tree --pretty=oneline initial
2 $