diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index edb9dcd551f0a577bb2032fc033d2da3aebd8842..70abaa0f6f134e02b4bb7867ccabdc91fa0a0b5d 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2665,11 +2665,6 @@ void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
 {
     CommandInProgress command = checkCommandInProgress(workingDirectory);
     switch (command) {
-    case Merge:
-        continuePreviousGitCommand(workingDirectory, tr("Continue Merge"),
-                                   tr("Merge is in progress. What do you want to do?"),
-                                   tr("Continue"), QLatin1String("merge"));
-        break;
     case Rebase:
     case RebaseMerge:
         continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"),
@@ -2677,6 +2672,11 @@ void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
                                    tr("Continue"), QLatin1String("rebase"),
                                    command != RebaseMerge);
         break;
+    case Merge:
+        continuePreviousGitCommand(workingDirectory, tr("Continue Merge"),
+                tr("You need to commit changes to finish merge.\nCommit now?"),
+                tr("Commit"), QLatin1String("merge"));
+        break;
     case Revert:
         continuePreviousGitCommand(workingDirectory, tr("Continue Revert"),
                 tr("You need to commit changes to finish revert.\nCommit now?"),