-
Notifications
You must be signed in to change notification settings - Fork 0
/
diff.xml
128 lines (128 loc) · 6.04 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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
<application>
<component name="DiffManager" COMPARISON_POLICY="Ignore spaces" />
<component name="DiffSettings">
<option name="PLACES_MAP">
<entry key="Default">
<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.diff.tools.dir.DirDiffTool" />
<option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
<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.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
<option value="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool" />
</list>
</option>
</PlaceSettings>
</entry>
<entry key="TestsFiledAssertions">
<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="VcsFileHistoryView">
<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="VcsLogView">
<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>
</option>
</component>
<component name="SvnDiffSettings">
<option name="PLACES_MAP">
<entry key="Default">
<PlaceSettings>
<option name="SPLITTER_PROPORTION" value="0.8558909" />
</PlaceSettings>
</entry>
</option>
</component>
<component name="TextDiffSettings">
<option name="PLACES_MAP">
<entry key="CommitDialog">
<PlaceSettings>
<option name="READ_ONLY_LOCK" value="false" />
</PlaceSettings>
</entry>
<entry key="Default">
<PlaceSettings>
<option name="BREADCRUMBS_PLACEMENT" value="BOTTOM" />
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
<option name="SHOW_INDENT_LINES" value="true" />
</PlaceSettings>
</entry>
<entry key="DirDiff">
<PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
</PlaceSettings>
</entry>
<entry key="Merge">
<PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
<option name="SHOW_INDENT_LINES" value="true" />
</PlaceSettings>
</entry>
<entry key="VcsFileHistoryView">
<PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" />
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
<option name="SHOW_INDENT_LINES" value="true" />
</PlaceSettings>
</entry>
<entry key="VcsLogView">
<PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
</PlaceSettings>
</entry>
</option>
<option name="SHARED_SETTINGS">
<SharedSettings>
<option name="MERGE_AUTO_APPLY_NON_CONFLICTED_CHANGES" value="true" />
</SharedSettings>
</option>
</component>
</application>