IDEA-182230 Cancel merge without confirmation if no changes were made

2026-09-27 10:03:11 +07:00 · 2018-01-02 23:00:01 +03:00
parent 835de9d8d0
commit 4aa17e9cca
1 changed files with 1 additions and 1 deletions
@@ -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;
          }