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.
41 lines
1.8 KiB
41 lines
1.8 KiB
<application>
|
|
<component name="DiffManager">
|
|
<filesTool value="diff" newValue="diff" />
|
|
<mergeToolParameters value="%1 %2 %3 %4" />
|
|
</component>
|
|
<component name="DiffSettings">
|
|
<option name="PLACES_MAP">
|
|
<entry key="DirDiff">
|
|
<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>
|
|
<option name="SHARED_SETTINGS">
|
|
<SharedSettings>
|
|
<option name="GO_TO_NEXT_FILE_ON_NEXT_DIFFERENCE" value="false" />
|
|
</SharedSettings>
|
|
</option>
|
|
</component>
|
|
<component name="ExternalDiffSettings">
|
|
<option name="DIFF_ENABLED" value="false" />
|
|
<option name="DIFF_DEFAULT" value="false" />
|
|
<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" />
|
|
</component>
|
|
</application> |