Be more user-friendly when refusing to do something because of conflict.
[git] / t / t4013 / diff.diff-tree_-p_master
1 $ git diff-tree -p master
2 $