From 3e24a07e2abf7ae85b9f1eb07111c6f995c5c899 Mon Sep 17 00:00:00 2001
From: Daniil Tsaryov <daniil.tsaryov@jetbrains.com>
Date: Mon, 8 Jun 2020 20:50:37 +0300
Subject: [PATCH] Do not drop commit message in git merge dialog if -m option
 is selected IDEA-242898

GitOrigin-RevId: f867c07053b38fa30af580b05798ac4a72eb36fd
---
 plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
index 7cbdcf8f272f..596a082725bf 100644
--- a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
@@ -359,8 +359,11 @@ class GitMergeDialog(private val project: Project,
   }
 
   private fun updateCommitMessagePanel() {
-    commitMsgPanel.isVisible = MergeOption.COMMIT_MESSAGE in selectedOptions
-    commitMsgField.text = ""
+    val useCommitMsg = MergeOption.COMMIT_MESSAGE in selectedOptions
+    commitMsgPanel.isVisible = useCommitMsg
+    if (!useCommitMsg) {
+      commitMsgField.text = ""
+    }
   }
 
   private fun createOptionButton(option: MergeOption) = OptionButton(option, option.option) { optionChosen(option) }