WS-2021.1 <martin@LFE-LNX-00274 Update diff.xml
This commit is contained in:
parent
38218206a5
commit
ef968bc76a
23
diff.xml
23
diff.xml
@ -4,15 +4,6 @@
|
|||||||
<entry key="ChangesView">
|
<entry key="ChangesView">
|
||||||
<PlaceSettings />
|
<PlaceSettings />
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="CommitDialog">
|
|
||||||
<PlaceSettings />
|
|
||||||
</entry>
|
|
||||||
<entry key="Default">
|
|
||||||
<PlaceSettings />
|
|
||||||
</entry>
|
|
||||||
<entry key="TestsFiledAssertions">
|
|
||||||
<PlaceSettings />
|
|
||||||
</entry>
|
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="TextDiffSettings">
|
<component name="TextDiffSettings">
|
||||||
@ -22,21 +13,15 @@
|
|||||||
<option name="EXPAND_BY_DEFAULT" value="false" />
|
<option name="EXPAND_BY_DEFAULT" value="false" />
|
||||||
</PlaceSettings>
|
</PlaceSettings>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="CommitDialog">
|
|
||||||
<PlaceSettings>
|
|
||||||
<option name="EXPAND_BY_DEFAULT" value="false" />
|
|
||||||
</PlaceSettings>
|
|
||||||
</entry>
|
|
||||||
<entry key="Default">
|
<entry key="Default">
|
||||||
<PlaceSettings>
|
<PlaceSettings>
|
||||||
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
|
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
|
||||||
</PlaceSettings>
|
</PlaceSettings>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="Merge">
|
<entry key="DirDiff">
|
||||||
<PlaceSettings />
|
<PlaceSettings>
|
||||||
</entry>
|
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
|
||||||
<entry key="TestsFiledAssertions">
|
</PlaceSettings>
|
||||||
<PlaceSettings />
|
|
||||||
</entry>
|
</entry>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
Loading…
Reference in New Issue
Block a user