MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: migration from old API - support 3-way-diff requests

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-07-13 19:41:56 +03:00
parent f069a3699b
commit 1f685f0a85
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
+1 -2
View File
@@ -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