Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dae65e22b7 | |||
| b50c68d228 |
@@ -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">
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
<component name="FindSettings">
|
||||
<option name="customScope" value="All Places" />
|
||||
<option name="defaultScopeName" value="All Places" />
|
||||
<option name="localRegularExpressions" value="true" />
|
||||
<option name="LOCAL_REGULAR_EXPRESSIONS" value="true" />
|
||||
<option name="SEARCH_SCOPE" value="All Places" />
|
||||
</component>
|
||||
</application>
|
||||
Reference in New Issue
Block a user