cherry-pick/revert: add scissors line on merge conflict
[git] / t / t4013 / diff.diff-tree_-r_initial
1 $ git diff-tree -r initial
2 $