diff.xml

<application>
  <component name="TextDiffSettings">
    <option name="PLACES_MAP">
      <entry key="Default">
        <PlaceSettings>
          <option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
        </PlaceSettings>
      </entry>
      <entry key="Merge">
        <PlaceSettings>
          <option name="HIGHLIGHTING_LEVEL" value="ADVANCED" />
          <option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
          <option name="SHOW_INDENT_LINES" value="true" />
          <option name="SHOW_WHITESPACES" value="true" />
        </PlaceSettings>
      </entry>
    </option>
    <option name="SHARED_SETTINGS">
      <SharedSettings>
        <option name="MERGE_AUTO_APPLY_NON_CONFLICTED_CHANGES" value="true" />
      </SharedSettings>
    </option>
  </component>
</application>