diff options
| author | Aleksey Pivovarov <AMPivovarov@gmail.com> | 2022-06-24 11:51:19 +0200 |
|---|---|---|
| committer | intellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com> | 2022-06-24 16:59:58 +0000 |
| commit | 2bd136dad188a9c5ad6fb9f878ee8fa5ef520fd4 (patch) | |
| tree | 2c4e6313ed426ae84dfe1a70fb6896480051dc75 | |
| parent | 6c646473beff03346d4dd2c12750dd66dd678a04 (diff) | |
| download | idea-2bd136dad188a9c5ad6fb9f878ee8fa5ef520fd4.tar.gz | |
IDEA-296696 diff: do not override external diff configs on IDE restart
(cherry picked from commit b234e86b750b6072235b42a122d495b2e058d239)
IJ-CR-26285
GitOrigin-RevId: 5a775d5e7b510e0ab73f5ec4285f3becf542cc5c
| -rw-r--r-- | platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.kt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.kt b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.kt index dd3c98dd0d7e..6212c47a899a 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.kt +++ b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.kt @@ -18,6 +18,10 @@ class ExternalDiffSettings : BaseState(), PersistentStateComponent<ExternalDiffS copyFrom(state) } + override fun noStateLoaded() { + isSettingsMigrated = true + } + @get:OptionTag("MIGRATE_OLD_SETTINGS") var isSettingsMigrated by property(false) |