diff.xml

<application>
  <component name="DiffSettings">
    <option name="PLACES_MAP">
      <entry key="ChangesView">
        <PlaceSettings />
      </entry>
      <entry key="CommitDialog">
        <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.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="ChangesView">
        <PlaceSettings />
      </entry>
      <entry key="CommitDialog">
        <PlaceSettings />
      </entry>
      <entry key="Default">
        <PlaceSettings>
          <option name="HIGHLIGHT_POLICY" value="BY_WORD_SPLIT" />
        </PlaceSettings>
      </entry>
    </option>
    <option name="SHARED_SETTINGS">
      <SharedSettings>
        <option name="MERGE_AUTO_APPLY_NON_CONFLICTED_CHANGES" value="true" />
      </SharedSettings>
    </option>
  </component>
</application>