From b2dae0276243de7ff59de3a7cd4bb19701f0e549 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 27 Sep 2015 17:03:56 +0300 Subject: Git: Enable "Continue Merging" dialog on deleted conflict When a Deleted conflict is aborted, this prompt appears too. Change-Id: I8f45363c4875b2d66bcbff93cf53b075d890ba2b Reviewed-by: Tobias Hunger Reviewed-by: Eike Ziller --- src/plugins/git/mergetool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index c273ef629a..cc58e6ff07 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -250,7 +250,7 @@ void MergeTool::readData() m_localState = waitAndReadStatus(m_localInfo); m_remoteState = waitAndReadStatus(m_remoteInfo); chooseAction(); - } else if (m_merging && line.startsWith("Continue merging")) { + } else if (line.startsWith("Continue merging")) { if (QMessageBox::question(Core::ICore::dialogParent(), tr("Continue Merging"), tr("Continue merging other unresolved paths?"), QMessageBox::Yes | QMessageBox::No, -- cgit v1.2.1