diff --git a/extensions/clojure/package.json b/extensions/clojure/package.json
index 4ea659b3b91..4c1dc3db8e9 100644
--- a/extensions/clojure/package.json
+++ b/extensions/clojure/package.json
@@ -36,7 +36,12 @@
         "scopeName": "source.clojure",
         "path": "./syntaxes/clojure.tmLanguage.json"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[clojure]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/coffeescript/package.json b/extensions/coffeescript/package.json
index e8fda02d0a3..61f89ecfee1 100644
--- a/extensions/coffeescript/package.json
+++ b/extensions/coffeescript/package.json
@@ -45,7 +45,12 @@
         "language": "coffeescript",
         "path": "./snippets/coffeescript.code-snippets"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[coffeescript]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/fsharp/package.json b/extensions/fsharp/package.json
index b6c07d40b1b..c88c1a7f194 100644
--- a/extensions/fsharp/package.json
+++ b/extensions/fsharp/package.json
@@ -41,7 +41,12 @@
         "language": "fsharp",
         "path": "./snippets/fsharp.code-snippets"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[fsharp]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index 69e4da10d23..9021acac872 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -93,7 +93,8 @@
     "configurationDefaults": {
       "[markdown]": {
         "editor.unicodeHighlight.ambiguousCharacters": false,
-        "editor.unicodeHighlight.invisibleCharacters": false
+        "editor.unicodeHighlight.invisibleCharacters": false,
+        "diffEditor.ignoreTrimWhitespace": false
       }
     }
   },
diff --git a/extensions/pug/package.json b/extensions/pug/package.json
index fd74f5b915c..0d3c6b6eed8 100644
--- a/extensions/pug/package.json
+++ b/extensions/pug/package.json
@@ -33,7 +33,12 @@
         "scopeName": "text.pug",
         "path": "./syntaxes/pug.tmLanguage.json"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[jade]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "repository": {
     "type": "git",
diff --git a/extensions/python/package.json b/extensions/python/package.json
index 17cbe7787e1..332ff083c2b 100644
--- a/extensions/python/package.json
+++ b/extensions/python/package.json
@@ -45,7 +45,12 @@
         "scopeName": "source.regexp.python",
         "path": "./syntaxes/MagicRegExp.tmLanguage.json"
       }
-    ]
+    ],
+    "configurationDefaults": {
+      "[python]": {
+        "diffEditor.ignoreTrimWhitespace": false
+      }
+    }
   },
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin MagicStack/MagicPython grammars/MagicPython.tmLanguage ./syntaxes/MagicPython.tmLanguage.json grammars/MagicRegExp.tmLanguage ./syntaxes/MagicRegExp.tmLanguage.json"
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index cc2de873468..fbbabd81709 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -62,7 +62,8 @@
       "[yaml]": {
         "editor.insertSpaces": true,
         "editor.tabSize": 2,
-        "editor.autoIndent": "advanced"
+        "editor.autoIndent": "advanced",
+        "diffEditor.ignoreTrimWhitespace": false
       },
       "[dockercompose]": {
         "editor.insertSpaces": true,