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

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 2b023bd98a2def18f8a91c95b14fb5aadcbf9a0c..e795b70b2b601aa1f823750d073fdaf80f7ee4d7 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -181,6 +181,23 @@ table.diff_tree {
        font-family: monospace;
 }
 
+table.combined.diff_tree td {
+       padding-right: 24px;
+}
+
+table.combined.diff_tree td.link {
+       padding: 0px 2px;
+}
+
+table.combined.diff_tree td.nochange a {
+       color: #6666ff;
+}
+
+table.combined.diff_tree td.nochange a:hover,
+table.combined.diff_tree td.nochange a:visited {
+       color: #d06666;
+}
+
 table.blame {
        border-collapse: collapse;
 }