--- a/vendor/diff-display/lib/diff/display/unified/generator.rb
+++ b/vendor/diff-display/lib/diff/display/unified/generator.rb
@@ -11,7 +11,7 @@ module Diff::Display
   class Unified::Generator
     
     # Extracts the line number info for a given diff section
-    LINE_NUM_RE = /@@ [+-]([0-9]+)(?:,([0-9]+))? [+-]([0-9]+)(?:,([0-9]+))? @@/
+    LINE_NUM_RE = /^@@ [+-]([0-9]+)(?:,([0-9]+))? [+-]([0-9]+)(?:,([0-9]+))? @@/
     LINE_TYPES  = {'+' => :add, '-' => :rem, ' ' => :unmod}
     
     # Runs the generator on a diff and returns a Data object
@@ -88,7 +88,7 @@ module Diff::Display
     
     protected
       def is_header_line?(line)
-        return true if ['++', '--'].include?(line[0,2])
+        return true if ['+++ ', '--- '].include?(line[0,4])
         return true if line =~ /^(new|delete) file mode [0-9]+$/
         return true if line =~ /^diff \-\-git/
         return true if line =~ /^index \w+\.\.\w+ [0-9]+$/

--- /dev/null
+++ b/vendor/diff-display/spec/fixtures/pseudo_recursive.diff
@@ -0,0 +1,21 @@
+diff --git a/spec/fixtures/multiple_rems_then_add.diff b/spec/fixtures/multiple_rems_then_add.diff
+new file mode 100644
+index 0000000..f5fd3f8
+--- /dev/null
++++ b/spec/fixtures/multiple_rems_then_add.diff
+@@ -0,0 +1,14 @@
++diff --git a/strokedb-ruby/lib/stores/chainable_storage.rb b/strokedb-ruby/lib/stores/chainable_storage.rb
++index 5326c92..1e2de8f 100644
++--- a/strokedb-ruby/lib/stores/chainable_storage.rb
+++++ b/strokedb-ruby/lib/stores/chainable_storage.rb
++@@ -44,9 +44,7 @@ module StrokeDB
++     def save_with_chained_storages!(chunk,source=nil)
++       perform_save!(chunk)
++       (@chained_storages||{}).each_pair do |storage,savings|
++-        unless storage == chunk
++-          savings << chunk unless savings.include?(chunk)
++-        end
+++          savings << chunk unless  storage == chunk || savings.include?(chunk)
++       end
++     end
+\ No newline at end of file

--- a/vendor/diff-display/spec/generator_spec.rb
+++ b/vendor/diff-display/spec/generator_spec.rb
@@ -36,10 +36,17 @@ describe Diff::Display::Unified::Generator do
     it "multiple rems and an add is in parity" do
       diff_data = load_diff("multiple_rems_then_add")
       data = Diff::Display::Unified::Generator.run(diff_data)
-      #pp data
       data.to_diff.should == diff_data.chomp
     end
     
+    it "doesn't parse linenumbers that isn't part if the diff" do
+      diff_data = load_diff("pseudo_recursive")
+      data = Diff::Display::Unified::Generator.run(diff_data)
+      linenos = []
+      data.each{|blk| blk.each{|line| linenos << line.number } }
+      linenos.compact.should == (1..14).to_a
+    end
+    
   end
   
 end