diff --git a/.editorconfig b/.editorconfig
index 28bb212ebd4..81dc8b4ad31 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.diff]
+trim_trailing_whitespace = false
+
 [Makefile]
 indent_style = tab
 
diff --git a/.gitignore b/.gitignore
index b3b120f3537..71f81598aac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ build
 .project
 .settings
 *.java.hsp
+*.java.hsw
 *.~ava
 /bundles
 /bisq-*