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

Git: Style fixes

Browse Source 
Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-10 19:49:18 +03:00
committed by Orgad Shaneh
parent 5cb29aec0b
commit 69d0d6cdca
13 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,7 +248,8 @@ void MergeTool::readData()
} else if (m_merging && line.startsWith("Continue merging")) {
if (QMessageBox::question(0, tr("Continue Merging"),
tr("Continue merging other unresolved paths?"),
QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No) == QMessageBox::Yes) {
m_process->write("y\n");
} else {
m_process->write("n\n");