summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/repository/cvs.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index ea75de5d3..5ff7af999 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -76,7 +76,8 @@ class Repository::Cvs < Repository
unless revision_to
revision_to=scm.get_previous_revision(revision_from)
end
- diff=diff+scm.diff(change_from.path, revision_from, revision_to)
+ file_diff = scm.diff(change_from.path, revision_from, revision_to)
+ diff = diff + file_diff unless file_diff.nil?
end
end
return diff