Merge branch 'jc/merge-reduce-parents-early'

diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css
index c530355a7cefefe694f8cbdcc3a7acc5725bec3a..cb86d2d029637ec64f70cc9e1cdbeeea972e8771 100644 (file)
--- a/gitweb/static/gitweb.css
+++ b/gitweb/static/gitweb.css
@@ -438,6 +438,10 @@ div.diff.add {
        color: #008800;
 }
 
+div.diff.add span.marked {
+       background-color: #aaffaa;
+}
+
 div.diff.from_file a.path,
 div.diff.from_file {
        color: #aa0000;
@@ -447,6 +451,10 @@ div.diff.rem {
        color: #cc0000;
 }
 
+div.diff.rem span.marked {
+       background-color: #ffaaaa;
+}
+
 div.diff.chunk_header a,
 div.diff.chunk_header {
        color: #990099;