Commit comparisons view shows less info if merge commit

[guillep]

The view that shows the commit diff only shows the diff against head and against the first parent commit. However, most of the times I'd like to see also:

• the diff against the working copy (instead of HEAD)
• the diff against the other parents (instead of just the first parent)