From 4aa17e9cca37fae0ed174894a710bf3c9c6581e2 Mon Sep 17 00:00:00 2001
From: Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Date: Wed, 13 Dec 2017 13:36:11 +0300
Subject: [PATCH] IDEA-182230 Cancel merge without confirmation if no changes
 were made

---
 .../diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java  | 2 +-
 1 file changed, 1 insertion(+), 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 5dde5c0b55c6..56dd41b5affe 100644
--- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
+++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
@@ -309,7 +309,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
               return;
             }
           }
-          if (result == MergeResult.CANCEL &&
+          if (result == MergeResult.CANCEL && myContentModified &&
               !MergeUtil.showExitWithoutApplyingChangesDialog(TextMergeViewer.this, myMergeRequest, myMergeContext)) {
             return;
           }