-
Notifications
You must be signed in to change notification settings - Fork 0
/
diff.xml
55 lines (55 loc) · 2.57 KB
/
diff.xml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
<application>
<component name="DiffSettings">
<option name="PLACES_MAP">
<entry key="Default">
<PlaceSettings>
<option name="DIFF_TOOLS_ORDER">
<list>
<option value="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
<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.database.diff.TableDiffTool" />
<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="DirDiff">
<PlaceSettings>
<option name="DIFF_TOOLS_ORDER">
<list>
<option value="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
<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.database.diff.TableDiffTool" />
<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>
</component>
<component name="TextDiffSettings">
<option name="PLACES_MAP">
<entry key="Default">
<PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
<option name="USE_SOFT_WRAPS" value="true" />
</PlaceSettings>
</entry>
<entry key="Merge">
<PlaceSettings>
<option name="ENABLE_SYNC_SCROLL" value="false" />
</PlaceSettings>
</entry>
</option>
</component>
</application>