Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 6 insertions, 0 deletions

diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/FilterPrintElementsManager.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/FilterPrintElementsManager.java
index 517128e01f4f..12ac6af5f388 100644
--- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/FilterPrintElementsManager.java
+++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/print/FilterPrintElementsManager.java
@@ -18,6 +18,7 @@ package com.intellij.vcs.log.graph.impl.print;
 
 import com.intellij.vcs.log.graph.GraphColorManager;
 import com.intellij.vcs.log.graph.api.LinearGraphWithCommitInfo;
+import com.intellij.vcs.log.graph.api.elements.GraphEdge;
 import com.intellij.vcs.log.graph.api.elements.GraphElement;
 import org.jetbrains.annotations.NotNull;
 
@@ -35,4 +36,9 @@ public class FilterPrintElementsManager<CommitId> extends AbstractPrintElementsM
   protected Set<Integer> getSelectedNodes(@NotNull GraphElement graphElement) {
     return Collections.emptySet();
   }
+
+  @Override
+  protected boolean allowSelectCollapsedEdge(@NotNull GraphEdge graphEdge) {
+    return false;
+  }
 }