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

Git: Enable "Continue Merging" dialog on deleted conflict

Browse Source 
When a Deleted conflict is aborted, this prompt appears too.

Change-Id: I8f45363c4875b2d66bcbff93cf53b075d890ba2b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-09-27 17:03:56 +03:00
committed by Orgad Shaneh
parent e241444ba3
commit b2dae02762
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,7 @@ void MergeTool::readData()
m_localState = waitAndReadStatus(m_localInfo); m_localState = waitAndReadStatus(m_localInfo);
m_remoteState = waitAndReadStatus(m_remoteInfo); m_remoteState = waitAndReadStatus(m_remoteInfo);
chooseAction(); chooseAction();
} else if (m_merging && line.startsWith("Continue merging")) { } else if (line.startsWith("Continue merging")) {
if (QMessageBox::question(Core::ICore::dialogParent(), tr("Continue Merging"), if (QMessageBox::question(Core::ICore::dialogParent(), tr("Continue Merging"),
tr("Continue merging other unresolved paths?"), tr("Continue merging other unresolved paths?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes | QMessageBox::No,