git notes merge: Manual conflict resolution, part 2/2
[git] / t / t4013 / diff.diff-tree_-p_master
1 $ git diff-tree -p master
2 $