The diff folding of blocks also folds away the first three lines of the next block, for instance: diff --git a/app/models/questionnaire.rb b/app/models/questionnaire.rb index 14284d6..b9ee4f5 100644 --- a/app/models/questionnaire.rb is also folded away if I fold the block before it. It seems to me that something is going wrong here. This diff was generated using 'git diff', but can also be created using 'diff -u'. Hope you can fix this. Cheers, Samuel