From 7b6fde3e05c58249ee1dda3d93b98fb24bb8fd57 Mon Sep 17 00:00:00 2001
From: Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Date: Tue, 15 May 2018 20:28:27 +0300
Subject: [PATCH] Esc should cancel merge without confirmation if no changes
 were made

IDEA-182230 followup - fixes IDEA-191716
---
 .../src/com/intellij/diff/merge/TextMergeViewer.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
index 253027b1fce0..295c8ee31863 100644
--- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
@@ -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;
   }