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

Esc should cancel merge without confirmation if no changes were made

Browse Source 
IDEA-182230 followup - fixes IDEA-191716
This commit is contained in:
Dmitriy Smirnov
2018-05-21 20:04:13 +03:00
parent beadcfbe4b
commit 7b6fde3e05
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
+6 -1
View File
@@ -135,7 +135,12 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
components.statusPanel = init.statusPanel;
components.toolbarActions = init.toolbarActions;
components.closeHandler = () -> MergeUtil.showExitWithoutApplyingChangesDialog(this, myMergeRequest, myMergeContext);
components.closeHandler = () -> {
if (myViewer.myContentModified)
return MergeUtil.showExitWithoutApplyingChangesDialog(this, myMergeRequest, myMergeContext);
else
return true;
};
return components;
}