git notes merge: Manual conflict resolution, part 2/2
[git] / t / t4013 / diff.diff-tree_--pretty_initial
1 $ git diff-tree --pretty initial
2 $