diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index 511a762acf4..8a224f09a7d 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -235,6 +235,13 @@ void MergeTool::readData()
prompt(tr("Unchanged File"), tr("Was the merge successful?"));
} else if (m_line.startsWith("Continue merging")) {
prompt(tr("Continue Merging"), tr("Continue merging other unresolved paths?"));
+ } else if (m_line.startsWith("Hit return")) {
+ QMessageBox::warning(
+ Core::ICore::dialogParent(), tr("Merge Tool"),
+ tr("Merge tool is not configured.
\n"
+ "Run git config --global merge.tool <tool> to configure it, "
+ "then try again
"));
+ m_process->kill();
} else if (m_line.endsWith('\n')) {
// Skip unidentified lines
m_line.clear();