diff --git a/vimrc b/vimrc
index 13e878e..2c29d70 100644
--- a/vimrc
+++ b/vimrc
@@ -427,6 +427,9 @@ if has("autocmd")
 endif
 "[Remove tabs and spaces at the end of lines]"
 function! DeleteTrailingTWS()
+    if &ft =~ 'diff'
+        return
+    end
     normal mb
     silent %s/[ \t]*$//g
     silent %s/\s\+$//ge