Compare commits
2 Commits
03eb61113f
...
ff51154b2e
| Author | SHA1 | Date | |
|---|---|---|---|
| ff51154b2e | |||
| e553eb2eee |
@@ -5,15 +5,20 @@
|
|||||||
<PlaceSettings>
|
<PlaceSettings>
|
||||||
<option name="DIFF_TOOLS_ORDER">
|
<option name="DIFF_TOOLS_ORDER">
|
||||||
<list>
|
<list>
|
||||||
<option value="com.intellij.diff.tools.simple.SimpleDiffTool" />
|
|
||||||
<option value="com.intellij.diff.tools.fragmented.UnifiedDiffTool" />
|
<option value="com.intellij.diff.tools.fragmented.UnifiedDiffTool" />
|
||||||
|
<option value="com.intellij.diff.tools.simple.SimpleDiffTool" />
|
||||||
<option value="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
|
<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.properties.SvnPropertiesDiffTool" />
|
||||||
<option value="org.jetbrains.idea.svn.difftool.SvnPhantomChangeDiffRequestProvider.SvnPhantomDiffTool" />
|
<option value="org.jetbrains.idea.svn.difftool.SvnPhantomChangeDiffRequestProvider.SvnPhantomDiffTool" />
|
||||||
<option value="org.jetbrains.idea.svn.difftool.SvnTreeConflictDiffRequestProvider.SvnTreeConflictDiffTool" />
|
<option value="org.jetbrains.idea.svn.difftool.SvnTreeConflictDiffRequestProvider.SvnTreeConflictDiffTool" />
|
||||||
<option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
|
<option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
|
||||||
<option value="com.intellij.diff.tools.dir.DirDiffTool" />
|
<option value="com.intellij.diff.tools.dir.DirDiffTool" />
|
||||||
|
<option value="com.intellij.diff.tools.combined.CombinedSideBySideDiffTool" />
|
||||||
|
<option value="com.intellij.diff.tools.combined.CombinedUnifiedDiffTool" />
|
||||||
|
<option value="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool.Unified" />
|
||||||
|
<option value="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool.SideBySide" />
|
||||||
|
<option value="com.android.studio.ml.bot.diff.diffviewers.BotUnifiedDiffTool" />
|
||||||
|
<option value="com.android.studio.ml.bot.diff.diffviewers.BotSplitViewDiffTool" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</PlaceSettings>
|
</PlaceSettings>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
<mapping ext="stl" type="PLAIN_TEXT" />
|
<mapping ext="stl" type="PLAIN_TEXT" />
|
||||||
<mapping ext="obj" type="PLAIN_TEXT" />
|
<mapping ext="obj" type="PLAIN_TEXT" />
|
||||||
<mapping ext="mtl" type="PLAIN_TEXT" />
|
<mapping ext="mtl" type="PLAIN_TEXT" />
|
||||||
|
<mapping ext="urdf" type="PLAIN_TEXT" />
|
||||||
<removed_mapping ext="apk" approved="true" type="ARCHIVE" />
|
<removed_mapping ext="apk" approved="true" type="ARCHIVE" />
|
||||||
<removed_mapping ext="csv" approved="true" type="CSV/TSV" />
|
<removed_mapping ext="csv" approved="true" type="CSV/TSV" />
|
||||||
<removed_mapping ext="db" approved="true" type="SQLite" />
|
<removed_mapping ext="db" approved="true" type="SQLite" />
|
||||||
|
|||||||
Reference in New Issue
Block a user