diff-tree -c: show a merge commit a bit more sensibly.