diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index 8a224f09a7d..f0f03e4ffc2 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -238,9 +238,10 @@ void MergeTool::readData() } 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

")); + QString("

%1

\n

%2

").arg( + tr("Merge tool is not configured."), + tr("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