diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-09-27 17:03:56 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-09-28 16:50:44 +0000 |
| commit | b2dae0276243de7ff59de3a7cd4bb19701f0e549 (patch) | |
| tree | 19acb16a911f7eba541f64c0ca49ffeb3edf1aee | |
| parent | e241444ba3c8a6d3e6bcf2b8188a290f13bb3881 (diff) | |
| download | qt-creator-b2dae0276243de7ff59de3a7cd4bb19701f0e549.tar.gz | |
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 <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| -rw-r--r-- | src/plugins/git/mergetool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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, |