Merge branch 'jk/rebase-i-submodule-conflict-only'
[git] / t / t4013 / diff.diff-tree_-r_--abbrev=4_initial
1 $ git diff-tree -r --abbrev=4 initial
2 $