From f0c8adf6df61315cb8a97ca473eff5bc48d3b781 Mon Sep 17 00:00:00 2001
From: Aiko Mastbbom <github@aiko.sh>
Date: Mon, 14 Sep 2020 23:53:23 +0200
Subject: [PATCH] IU-2020.2.1 <aiko@Lindas-MacBook-Pro.local Update diff.xml

---
 diff.xml | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/diff.xml b/diff.xml
index 370bac9..d1f4f0d 100644
--- a/diff.xml
+++ b/diff.xml
@@ -1,16 +1,36 @@
 <application>
-  <component name="TextDiffSettings">
+  <component name="DiffSettings">
     <option name="PLACES_MAP">
-      <entry key="Merge">
+      <entry key="ChangesView">
         <PlaceSettings>
-          <option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
+          <option name="DIFF_TOOLS_ORDER">
+            <list>
+              <option value="com.intellij.diff.tools.simple.SimpleDiffTool" />
+              <option value="com.intellij.diff.tools.fragmented.UnifiedDiffTool" />
+              <option value="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
+              <option value="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool" />
+              <option value="com.intellij.database.model.diff.SchemaDiffTool" />
+              <option value="com.intellij.database.diff.TableDiffTool" />
+              <option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
+              <option value="com.intellij.diff.tools.dir.DirDiffTool" />
+            </list>
+          </option>
         </PlaceSettings>
       </entry>
+    </option>
+  </component>
+  <component name="TextDiffSettings">
+    <option name="PLACES_MAP">
       <entry key="ChangesView">
         <PlaceSettings>
           <option name="EXPAND_BY_DEFAULT" value="false" />
         </PlaceSettings>
       </entry>
+      <entry key="Merge">
+        <PlaceSettings>
+          <option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
+        </PlaceSettings>
+      </entry>
     </option>
   </component>
 </application>
\ No newline at end of file