2016-02-19 23:18:29 +00:00
|
|
|
<application>
|
|
|
|
<component name="DiffSettings">
|
|
|
|
<option name="PLACES_MAP">
|
|
|
|
<entry key="ChangesView">
|
|
|
|
<PlaceSettings />
|
|
|
|
</entry>
|
2021-06-09 09:48:10 +00:00
|
|
|
<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>
|
2016-02-19 23:18:29 +00:00
|
|
|
</option>
|
|
|
|
</component>
|
2022-08-02 08:48:01 +00:00
|
|
|
<component name="ExternalDiffSettings">
|
|
|
|
<option name="MIGRATE_OLD_SETTINGS" value="true" />
|
|
|
|
</component>
|
2016-02-19 23:18:29 +00:00
|
|
|
<component name="TextDiffSettings">
|
|
|
|
<option name="PLACES_MAP">
|
|
|
|
<entry key="ChangesView">
|
|
|
|
<PlaceSettings>
|
|
|
|
<option name="EXPAND_BY_DEFAULT" value="false" />
|
|
|
|
</PlaceSettings>
|
|
|
|
</entry>
|
2021-04-27 15:19:42 +00:00
|
|
|
<entry key="DirDiff">
|
2016-03-23 10:29:11 +00:00
|
|
|
<PlaceSettings>
|
|
|
|
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
|
|
|
|
</PlaceSettings>
|
2016-02-19 23:18:29 +00:00
|
|
|
</entry>
|
2022-05-24 12:39:50 +00:00
|
|
|
<entry key="Merge">
|
|
|
|
<PlaceSettings>
|
|
|
|
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
|
|
|
|
</PlaceSettings>
|
|
|
|
</entry>
|
2016-02-19 23:18:29 +00:00
|
|
|
</option>
|
|
|
|
</component>
|
WS-11.0.3 <marti@DESKTOP-ITST4MB Create baseRefactoring.xml, markdown.xml, ide.general.xml, git.xml, project.default.xml, diff.xml, other.xml, scratches.xml, file.template.settings.xml, find.xml, ui.lnf.xml, keymap.xml, code.style.schemes.xml, Book.xhtml, watcherDefaultTasks.xml, colors.scheme.xml, Default.xml, laf.xml, path.macros.xml, Default _1_.xml, web-browsers.xml, vcs.xml, Cobalt copy.icls, editor.xml, debugger.xml
2016-02-16 00:44:57 +00:00
|
|
|
</application>
|