PycharmSettings/diff.xml

<application>
  <component name="DiffManager">
    <filesTool value="diff" newValue="diff" />
    <mergeToolParameters value="%1 %2 %3 %4" />
  </component>
  <component name="DiffSettings">
    <option name="PLACES_MAP">
      <entry key="ChangesView">
        <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="com.intellij.diff.tools.combined.CombinedUnifiedDiffTool" />
              <option value="com.intellij.diff.tools.combined.CombinedSideBySideDiffTool" />
              <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.model.diff.SchemaDiffTool" />
              <option value="com.intellij.database.diff.TableDiffTool" />
              <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="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.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>
    <option name="SHARED_SETTINGS">
      <SharedSettings>
        <option name="GO_TO_NEXT_FILE_ON_NEXT_DIFFERENCE" value="false" />
      </SharedSettings>
    </option>
  </component>
  <component name="ExternalDiffSettings">
    <option name="DEFAULT_TOOL_CONFIGURATION">
      <ExternalToolConfiguration>
        <option name="diffToolName" value="Diff" />
      </ExternalToolConfiguration>
    </option>
    <option name="DIFF_EXE_PATH" value="diff" />
    <option name="EXTERNAL_TOOLS">
      <map>
        <entry key="DIFF_TOOL">
          <value>
            <list>
              <ExternalTool>
                <option name="argumentPattern" value="%1 %2 %3" />
                <option name="name" value="Diff" />
                <option name="programPath" value="diff" />
              </ExternalTool>
            </list>
          </value>
        </entry>
      </map>
    </option>
    <option name="MIGRATE_OLD_SETTINGS" value="true" />
  </component>
</application>