Linus Torvalds [off-list ref] writes:
So it would be much nicer if gitweb had some alternate approach to showing
merge diffs. My suggested approach would be to just let the user choose:
have separate "diff against fist/second[/third[/..]] parent" buttons. And
one of the choices would be the "conflict view" that git-diff-tree --cc
gives (I'd argue for that being the default one, because it's the only one
that doesn't have a "preferred parent").
I have something very rough, but I will be sending them out
anyways.