WS-2021.2 <debuggerx@debuggerx-PC Create markdown.xml, IntelliLang.xml, DebuggerX.xml, MyStyle.icls, project.default.xml, diff.xml, Default copy.xml, yiiguxing.translation.xml, Default.xml, Monokai Sublime Text 3.icls, file.template.settings.xml, ignore.xml, find.xml, code.style.schemes.xml, Default _3_.xml, git.xml, Interface JavaDoc.tpl, My Vim dark .icls, Set Method JavaDoc.tpl, Default.xml, Default _2_.xml, Vim dark.icls, Class JavaDoc.tpl, Method JavaDoc.tpl, Eclipse copy.xml, lightEdit.xml, Throws clause JavaDoc.tpl, Return type JavaDoc.tpl, editor.xml, webServers.xml, debugger.xml, updates.xml, baseRefactoring.xml, ide.general.xml, ide-features-trainer.xml, Constructor JavaDoc.tpl, Parameter JavaDoc.tpl, keymap.xml, ui.lnf.xml, Get Method JavaDoc.tpl, filetypes.xml, projectView.xml, colors.scheme.xml, notifications.xml, wechatCode.xml, github.xml, templates.xml, laf.xml, customization.xml, Default for GNOME copy.xml, jdk.table.xml, phonegap.xml, Default _1_.xml, web-browsers.xml, macros.xml, vcs.xml, grazie_global.xml
4 years ago
|
|
|
<application>
|
|
|
|
<component name="DiffSettings">
|
|
|
|
<option name="PLACES_MAP">
|
|
|
|
<entry key="ChangesView">
|
|
|
|
<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="com.intellij.diff.tools.combined.CombinedUnifiedDiffTool" />
|
|
|
|
<option value="com.intellij.diff.tools.combined.CombinedSideBySideDiffTool" />
|
|
|
|
<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>
|
WS-2021.2 <debuggerx@debuggerx-PC Create markdown.xml, IntelliLang.xml, DebuggerX.xml, MyStyle.icls, project.default.xml, diff.xml, Default copy.xml, yiiguxing.translation.xml, Default.xml, Monokai Sublime Text 3.icls, file.template.settings.xml, ignore.xml, find.xml, code.style.schemes.xml, Default _3_.xml, git.xml, Interface JavaDoc.tpl, My Vim dark .icls, Set Method JavaDoc.tpl, Default.xml, Default _2_.xml, Vim dark.icls, Class JavaDoc.tpl, Method JavaDoc.tpl, Eclipse copy.xml, lightEdit.xml, Throws clause JavaDoc.tpl, Return type JavaDoc.tpl, editor.xml, webServers.xml, debugger.xml, updates.xml, baseRefactoring.xml, ide.general.xml, ide-features-trainer.xml, Constructor JavaDoc.tpl, Parameter JavaDoc.tpl, keymap.xml, ui.lnf.xml, Get Method JavaDoc.tpl, filetypes.xml, projectView.xml, colors.scheme.xml, notifications.xml, wechatCode.xml, github.xml, templates.xml, laf.xml, customization.xml, Default for GNOME copy.xml, jdk.table.xml, phonegap.xml, Default _1_.xml, web-browsers.xml, macros.xml, vcs.xml, grazie_global.xml
4 years ago
|
|
|
<entry key="CommitDialog">
|
|
|
|
<PlaceSettings>
|
|
|
|
<option name="DIFF_TOOLS_ORDER">
|
|
|
|
<list>
|
|
|
|
<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.simple.SimpleDiffTool" />
|
|
|
|
<option value="com.intellij.diff.tools.fragmented.UnifiedDiffTool" />
|
|
|
|
<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="Default">
|
|
|
|
<PlaceSettings>
|
|
|
|
<option name="EXPAND_BY_DEFAULT" value="false" />
|
|
|
|
</PlaceSettings>
|
|
|
|
</entry>
|
|
|
|
</option>
|
|
|
|
</component>
|
|
|
|
</application>
|