diff options
| author | Petar Perisin <petar.perisin@gmail.com> | 2013-10-05 16:10:54 +0200 |
|---|---|---|
| committer | Petar Perisin <petar.perisin@gmail.com> | 2013-10-22 20:42:50 +0200 |
| commit | ab71755326eeee537fb9eee157d7fffcd54cb723 (patch) | |
| tree | d8a7c8250f4f1dd6deb67f890e47de779f0b9dbf /src/plugins/git/gitclient.cpp | |
| parent | 36e6a705052c005529eb8558736e1c9df6865355 (diff) | |
| download | qt-creator-ab71755326eeee537fb9eee157d7fffcd54cb723.tar.gz | |
Git: Fix popup message for merge
Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index edb9dcd551..70abaa0f6f 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?"), |