|
|
|
|
@ -5,6 +5,27 @@
|
|
|
|
|
</component>
|
|
|
|
|
<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.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>
|
|
|
|
|
<entry key="DirDiff">
|
|
|
|
|
<PlaceSettings>
|
|
|
|
|
<option name="DIFF_TOOLS_ORDER">
|
|
|
|
|
@ -30,12 +51,27 @@
|
|
|
|
|
</option>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ExternalDiffSettings">
|
|
|
|
|
<option name="DIFF_ENABLED" value="false" />
|
|
|
|
|
<option name="DIFF_DEFAULT" value="false" />
|
|
|
|
|
<option name="DEFAULT_TOOL_CONFIGURATION">
|
|
|
|
|
<ExternalToolConfiguration>
|
|
|
|
|
<option name="diffToolName" value="Diff" />
|
|
|
|
|
</ExternalToolConfiguration>
|
|
|
|
|
</option>
|
|
|
|
|
<option name="DIFF_EXE_PATH" value="diff" />
|
|
|
|
|
<option name="DIFF_PARAMETERS" value="%1 %2 %3" />
|
|
|
|
|
<option name="MERGE_ENABLED" value="false" />
|
|
|
|
|
<option name="MERGE_EXE_PATH" value="" />
|
|
|
|
|
<option name="MERGE_PARAMETERS" value="%1 %2 %3 %4" />
|
|
|
|
|
<option name="EXTERNAL_TOOLS">
|
|
|
|
|
<map>
|
|
|
|
|
<entry key="DIFF_TOOL">
|
|
|
|
|
<value>
|
|
|
|
|
<list>
|
|
|
|
|
<ExternalTool>
|
|
|
|
|
<option name="argumentPattern" value="%1 %2 %3" />
|
|
|
|
|
<option name="name" value="Diff" />
|
|
|
|
|
<option name="programPath" value="diff" />
|
|
|
|
|
</ExternalTool>
|
|
|
|
|
</list>
|
|
|
|
|
</value>
|
|
|
|
|
</entry>
|
|
|
|
|
</map>
|
|
|
|
|
</option>
|
|
|
|
|
<option name="MIGRATE_OLD_SETTINGS" value="true" />
|
|
|
|
|
</component>
|
|
|
|
|
</application>
|
debuggerx
3 years ago