feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MergeTool: use multiarg arg()

Browse Source 
Change-Id: If3859509dae9f44ab54ad50491a42f09e5e3a94b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2021-11-02 18:14:28 +01:00
parent 50586c7bb8
commit e6969cfa05
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/mergetool.cpp
View File

@@ -154,11 +154,9 @@ void MergeTool::chooseAction()
msgBox.setIcon(QMessageBox::Question); msgBox.setIcon(QMessageBox::Question);
msgBox.setStandardButtons(QMessageBox::Abort); msgBox.setStandardButtons(QMessageBox::Abort);
msgBox.setText(tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4") msgBox.setText(tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4")
.arg(mergeTypeName()) .arg(mergeTypeName(), m_fileName,
.arg(m_fileName) stateName(m_localState, m_localInfo),
.arg(stateName(m_localState, m_localInfo)) stateName(m_remoteState, m_remoteInfo)));
.arg(stateName(m_remoteState, m_remoteInfo))
);
switch (m_mergeType) { switch (m_mergeType) {
case SubmoduleMerge: case SubmoduleMerge:
case SymbolicLinkMerge: case SymbolicLinkMerge: