You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
82 lines
4.0 KiB
82 lines
4.0 KiB
<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="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">
|
|
<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">
|
|
<list>
|
|
<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.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" />
|
|
<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" />
|
|
</list>
|
|
</option>
|
|
</PlaceSettings>
|
|
</entry>
|
|
</option>
|
|
</component>
|
|
<component name="ExternalDiffSettings">
|
|
<option name="MIGRATE_OLD_SETTINGS" value="true" />
|
|
</component>
|
|
<component name="TextDiffSettings">
|
|
<option name="PLACES_MAP">
|
|
<entry key="ChangesView">
|
|
<PlaceSettings>
|
|
<option name="EXPAND_BY_DEFAULT" value="false" />
|
|
<option name="SHOW_LINE_NUMBERS" value="false" />
|
|
<option name="USE_SOFT_WRAPS" value="true" />
|
|
</PlaceSettings>
|
|
</entry>
|
|
<entry key="CommitDialog">
|
|
<PlaceSettings>
|
|
<option name="EXPAND_BY_DEFAULT" value="false" />
|
|
<option name="READ_ONLY_LOCK" value="false" />
|
|
</PlaceSettings>
|
|
</entry>
|
|
<entry key="DirDiff">
|
|
<PlaceSettings>
|
|
<option name="HIGHLIGHT_POLICY" value="BY_LINE" />
|
|
</PlaceSettings>
|
|
</entry>
|
|
</option>
|
|
</component>
|
|
</application> |