--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -37,82 +37,21 @@ module BrowseHelper
   end  
   
   # Takes a unified diff as input and renders it as html
-  # this is the crappy one from collaboa
-  # TODO: finish up the proper OO one
-   def render_diff(udiff, src_sha, dst_sha)
-     return if udiff.blank?
-     out = "<table class=\"codediff\">\n"
-
-     lines = udiff.split("\n")
-     lines.reject!{ |line| line =~ /^(new|deleted) file mode [0-9]+/ }
-     lines.reject!{ |line| line =~ /^index [a-z0-9]+\.\.[a-z0-9]+/ }
-
-     lines_that_differs = /@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@/
-
-     out << "<thead>\n"
-     out << %Q{\t<tr><td class="line-numbers">#{src_sha}</td>}
-     out << %Q{<td class="line-numbers">#{dst_sha}</td><td>&nbsp</td></tr>\n}
-     out << "</thead>\n"
-
-     prev_counter = 0
-     cur_counter = 0
-     change_num = 0
-
-     if lines.size < 3
-       return
-     end
-     
-     lines[3..lines.length].each do |line|      
-       if line_nums = line.match(lines_that_differs)      
-       	prev_line_numbers = line_nums[1].to_i...(line_nums[1].to_i + (line_nums[2]).to_i)
-         cur_line_numbers = line_nums[3].to_i...(line_nums[3].to_i + (line_nums[4]).to_i)
-         prev_counter = prev_line_numbers.first - 1
-         cur_counter = cur_line_numbers.first - 1
-         change_num += 1 
-       end
-
-       line = h(line)
-       line.gsub!(/^\s/, '') # The column where + or - would be
-       line.gsub!(/^(\+{1}(\s+|\t+)?(.*))/, '\2<ins>\3</ins>')
-       line.gsub!(/^(-{1}(\s+|\t+)?(.*))/, '\2<del>\3</del>')
-       #line.gsub!('\ No newline at end of file', '')
-
-       out << "<tr class=\"changes\">\n"
-
-       if line.match(/^(\s+|\t+)?<del>/) 
-         out << "\t<td class=\"line-numbers\">" + prev_counter.to_s + "</td>\n"
-         out << "\t<td class=\"line-numbers\">&nbsp;</td>\n"
-         prev_counter += 1
-         action_class = 'del'
-       elsif line.match(/^(\s+|\t+)?<ins>/)
-         out << "\t<td class=\"line-numbers\">&nbsp;</td>\n"
-         out << "\t<td class=\"line-numbers\">" + cur_counter.to_s + "</td>\n"
-         cur_counter += 1 
-         action_class = 'ins'
-       else
-         if line.match(lines_that_differs)
-           line = ''
-           if change_num > 1
-             out << "\t<td class=\"line-numbers line-num-cut\">...</td>\n"
-             out << "\t<td class=\"line-numbers line-num-cut\">...</td>\n"
-             action_class = 'cut-line'
-           else 
-             out << "\t<td class=\"line-numbers\"></td>\n"
-             out << "\t<td class=\"line-numbers\"></td>\n"
-             action_class = 'unchanged'
-           end
-         else
-           out << "\t<td class=\"line-numbers\"></td>\n"
-           out << "\t<td class=\"line-numbers\"></td>\n"
-           action_class = 'unchanged'
-         end
-         prev_counter += 1 
-         cur_counter += 1 
-       end
-
-       out << "\t<td class=\"code #{action_class}\">" + line + "</td></tr>\n"     
-     end
-     out << "\n</table>\n"
-   end
+  def render_diff(udiff, src_sha, dst_sha)
+    return if udiff.blank?
+    
+    callback = Gitorious::Diff::InlineTableCallback.new
+    
+    out = %Q{<table class="codediff">\n}
+    out << "<thead>\n"
+    out << "<tr>"
+    out << %Q{<td class="line-numbers">#{src_sha}</td>}
+    out << %Q{<td class="line-numbers">#{dst_sha}</td>}
+    out << "<td>&nbsp</td></tr>\n"
+    out << "</thead>\n"
+    out << Diff::Display::Unified::Renderer.run(udiff, callback)
+    out << "</table>"
+    out
+  end
   
 end

--- a/config/initializers/requires.rb
+++ b/config/initializers/requires.rb
@@ -1,3 +1,4 @@
 require "core_ext"
 require "fileutils"
-require "git"
\ No newline at end of file
+require "git"
+require "diff-display/lib/diff/display/unified"
\ No newline at end of file

--- /dev/null
+++ b/lib/gitorious/diff/inline_table_callback.rb
@@ -0,0 +1,98 @@
+module Gitorious
+  module Diff
+    class InlineTableCallback
+      
+      # Before blocks
+      def before_addblock(block)
+      end
+      
+      def before_remblock(block) 
+      end
+      
+      def before_modblock(block)
+      end
+      
+      def before_unmodblock(block)
+      end
+      
+      def before_sepblock(block)
+      end
+      
+      # After blocks
+      def after_addblock(block)
+      end
+      
+      def after_remblock(block)
+      end
+      
+      def after_modblock(block)
+      end
+      
+      def after_unmodblock(block)
+      end
+      
+      def after_sepblock(block)
+      end
+      
+      # Before lines
+      def before_addline(line)
+        %Q{<tr class="changes">} + 
+        %Q{<td class="line-numbers">&nbsp;</td>} + 
+        %Q{<td class="line-numbers">#{line.number}</td>} + 
+        %Q{<td class="code ins"><ins>}
+      end
+      
+      def before_remline(line)
+        %Q{<tr class="changes">} + 
+        %Q{<td class="line-numbers">#{line.number}</td>} + 
+        %Q{<td class="line-numbers">&nbsp;</td>} + 
+        %Q{<td class="code del"><del>}
+      end
+      
+      def before_modline(line)
+        %Q{<tr class="changes">} + 
+        %Q{<td class="line-numbers">&nbsp;</td>} + 
+        %Q{<td class="line-numbers">#{line.number}</td>} + 
+        %Q{<td class="code unchanged mod">}
+      end
+      
+      def before_unmodline(line)
+        %Q{<tr class="changes">} + 
+        %Q{<td class="line-numbers">&nbsp;</td>} + 
+        %Q{<td class="line-numbers">#{line.number}</td>} + 
+        %Q{<td class="code unchanged unmod">}
+      end
+      
+      def before_sepline(line)
+        %Q{<tr class="changes">} + 
+        %Q{<td class="line-numbers line-num-cut">...</td>} + 
+        %Q{<td class="line-numbers line-num-cut">...</td>} + 
+        %Q{<td class="code cut-line">}
+      end
+      
+      # After lines
+      def after_addline(line)
+       "</ins></td></tr>"
+      end
+      
+      def after_remline(line)
+       "</del></td></tr>"
+      end
+      
+      def after_modline(line)
+       "</td></tr>"
+      end
+      
+      def after_unmodline(line)
+       "</td></tr>"
+      end
+      
+      def after_sepline(line)
+       "</td></tr>"
+      end
+      
+      def new_line
+      end
+    end
+  end
+end
\ No newline at end of file

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -592,8 +592,7 @@ table.codediff td.cut-line {
   border-top: 1px dashed #aaa; 
   border-bottom: 1px dashed #aaa; 
 }
-
-del { background: #fbb; text-decoration: none; }
-ins { background: #afa; text-decoration: none; }
 table.codediff td.del { background: #fdd; }
-table.codediff td.ins { background: #dfd; }
\ No newline at end of file
+table.codediff td.ins { background: #dfd; }
+table.codediff td.del del { /*background: #fbb;*/ text-decoration: none; }
+table.codediff td.ins ins { /*background: #afa;*/ text-decoration: none; }

--- /dev/null
+++ b/vendor/diff-display/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2003 Marcel Molina Jr.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--- /dev/null
+++ b/vendor/diff-display/README
@@ -0,0 +1 @@
+Marcel Molina Jr. wrote this library probably back in 2004 or so.
\ No newline at end of file