From ba04fac9a946533aa6b5ceffae3f3bd94de988fe Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 9 May 2018 18:10:27 +0200 Subject: [PATCH] Fix cache update (IDEA-CR-32440) --- .../openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt index d07e377f1904..8bc229a79dfb 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/DefaultChangesGroupingPolicy.kt @@ -23,7 +23,7 @@ class DefaultChangesGroupingPolicy(val project: Project, val model: DefaultTreeM it.markAsHelperNode() model.insertNodeInto(it, subtreeRoot, subtreeRoot.childCount) - CONFLICTS_NODE_CACHE[subtreeRoot] = it + CONFLICTS_NODE_CACHE[cachingRoot] = it TreeModelBuilder.IS_CACHING_ROOT.set(it, true) } }