|
|
|
@ -1,6 +1,25 @@
|
|
|
|
<application>
|
|
|
|
<application>
|
|
|
|
<component name="DiffSettings">
|
|
|
|
<component name="DiffSettings">
|
|
|
|
<option name="PLACES_MAP">
|
|
|
|
<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>
|
|
|
|
<entry key="CommitDialog">
|
|
|
|
<entry key="CommitDialog">
|
|
|
|
<PlaceSettings>
|
|
|
|
<PlaceSettings>
|
|
|
|
<option name="DIFF_TOOLS_ORDER">
|
|
|
|
<option name="DIFF_TOOLS_ORDER">
|
|
|
|
|
