blame: allow "blame file" in the middle of a conflicted merge
[git] / t / t4013 / diff.diff-tree_-p_master
1 $ git diff-tree -p master
2 $