48 lines
1.9 KiB
XML
48 lines
1.9 KiB
XML
<application>
|
|
<component name="DiffSettings">
|
|
<option name="PLACES_MAP">
|
|
<entry key="ChangesView">
|
|
<PlaceSettings />
|
|
</entry>
|
|
<entry key="VcsFileHistoryView">
|
|
<PlaceSettings>
|
|
<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="org.jetbrains.idea.svn.difftool.properties.SvnPropertiesDiffTool" />
|
|
<option value="org.jetbrains.idea.svn.difftool.SvnPhantomChangeDiffRequestProvider.SvnPhantomDiffTool" />
|
|
<option value="org.jetbrains.idea.svn.difftool.SvnTreeConflictDiffRequestProvider.SvnTreeConflictDiffTool" />
|
|
<option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
|
|
<option value="com.intellij.diff.tools.dir.DirDiffTool" />
|
|
</list>
|
|
</option>
|
|
</PlaceSettings>
|
|
</entry>
|
|
</option>
|
|
</component>
|
|
<component name="ExternalDiffSettings">
|
|
<option name="MIGRATE_OLD_SETTINGS" value="true" />
|
|
</component>
|
|
<component name="TextDiffSettings">
|
|
<option name="PLACES_MAP">
|
|
<entry key="ChangesView">
|
|
<PlaceSettings>
|
|
<option name="EXPAND_BY_DEFAULT" value="false" />
|
|
</PlaceSettings>
|
|
</entry>
|
|
<entry key="DirDiff">
|
|
<PlaceSettings>
|
|
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
|
|
</PlaceSettings>
|
|
</entry>
|
|
<entry key="Merge">
|
|
<PlaceSettings>
|
|
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
|
|
</PlaceSettings>
|
|
</entry>
|
|
</option>
|
|
</component>
|
|
</application> |