gitweb: Show combined diff for merge commits in 'commitdiff' view