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

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 5e402924040d55aff5fb831a737d108d1e68a0bb..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;
 }
@@ -387,6 +404,10 @@ div.diff.incomplete {
        color: #cccccc;
 }
 
+div.diff.nodifferences {
+       font-weight: bold;
+       color: #600000;
+}
 
 div.index_include {
        border: solid #d9d8d1;