From 1f685f0a855c0c2ac8ef1e13f62511fbe56403cf Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 12 Jul 2018 14:35:09 +0300
Subject: [PATCH] diff: migration from old API - support 3-way-diff requests

---
 .../openapi/vcs/changes/actions/migrate/MigrateDiffTool.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
index f170ecd1b102..948d748b2887 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
@@ -69,8 +69,7 @@ public class MigrateDiffTool implements DiffTool {
   @Override
   public boolean canShow(DiffRequest request) {
     if (request instanceof MergeRequest) return false;
-    if (request.getContents().length != 2) return false;
-    return true;
+    return request.getContents().length == 2 || request.getContents().length == 3;
   }
 
   @Override