aiko/idea-shared-settings
aiko/idea-shared-settings
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IU-2020.2.1 <aiko@Lindas-MacBook-Pro.local Update diff.xml

Browse Source
This commit is contained in:
Aiko Mastboom 2020-09-14 23:53:23 +02:00
parent 74a4069107
commit f0c8adf6df
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
diff.xml
View File

@ -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>