|
|
|
@ -18,6 +18,23 @@
|
|
|
|
|
</option>
|
|
|
|
|
</PlaceSettings>
|
|
|
|
|
</entry>
|
|
|
|
|
<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>
|
|
|
|
|
<entry key="Default">
|
|
|
|
|
<PlaceSettings>
|
|
|
|
|
<option name="DIFF_TOOLS_ORDER">
|
|
|
|
|