debuggerx
/
AndroidStudioSettings
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
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.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd9e70f2332'
${ noResults }
AndroidStudioSettings/diff.xml

55 lines
2.6 KiB
Raw Normal View History Unescape

AI-Arctic Fox | 2020.3.1 <debuggerx@debuggerx-PC Create laf.xml, debugger.xml, visualizationTool.xml, updates.xml, DebuggerX.xml, MyStyle.icls, Enum.java, Default copy.xml, Interface.java, editor.xml, Default.xml, ide.general.xml, project.default.xml, Monokai Sublime Text 3.icls, File Header.java, code.style.schemes.xml, pluginAdvertiser.xml, Default _3_.xml, androidStudioFirstRun.xml, My Vim dark .icls, ignore.xml, web-browsers.xml, usageView.xml, Default.xml, yiiguxing.translation.xml, Default _2_.xml, Vim dark.icls, jdk.table.xml, lightEdit.xml, Eclipse copy.xml, notifications.xml, filetypes.xml, git.xml, macros.xml, templates.xml, colors.scheme.xml, Singleton.java, github.xml, IntelliLang.xml, baseRefactoring.xml, External Tools.xml, androidEditors.xml, AnnotationType.java, emmet.xml, toStringTemplates.xml, ui.lnf.xml, customization.xml, Default for GNOME copy.xml, Class.java, proxy.settings.xml, Default _1_.xml, vcs.xml, gutter.xml, plugin_ui.xml, file.template.settings.xml, keymap.xml, find.xml, diff.xml, path.macros.xml
4 years ago
<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="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="TextDiffSettings">
<option name="PLACES_MAP">
<entry key="CommitDialog">
<PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" />
<option name="READ_ONLY_LOCK" value="false" />
</PlaceSettings>
</entry>
<entry key="Default">
<PlaceSettings>
<option name="ENABLE_SYNC_SCROLL" value="false" />
</PlaceSettings>
</entry>
</option>
</component>
</application>