Commit be7f7330 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Use consistent ordering for Merge Tool dialog

On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"

That makes Ignore default on Windows, which is confusing

Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: default avatarTobias Hunger <>
parent e0f50c04
...@@ -2160,12 +2160,13 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c ...@@ -2160,12 +2160,13 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c
{ {
QString message = commit.isEmpty() ? tr("Conflicts detected") QString message = commit.isEmpty() ? tr("Conflicts detected")
: tr("Conflicts detected with commit %1").arg(commit); : tr("Conflicts detected with commit %1").arg(commit);
QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message);
message, QMessageBox::Ignore | QMessageBox::Abort);
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"), QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),
QMessageBox::ActionRole); QMessageBox::AcceptRole);
if (abortCommand == QLatin1String("rebase")) if (abortCommand == QLatin1String("rebase"))
mergeOrAbort.addButton(tr("&Skip"), QMessageBox::ActionRole); mergeOrAbort.addButton(tr("&Skip"), QMessageBox::RejectRole);
switch (mergeOrAbort.exec()) { switch (mergeOrAbort.exec()) {
case QMessageBox::Abort: case QMessageBox::Abort:
synchronousAbortCommand(workingDir, abortCommand); synchronousAbortCommand(workingDir, abortCommand);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment