diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-24 08:56:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-24 08:56:29 +0200 |
| commit | c3119d1aa70a25ab7aeb39b0448c1d10c08aba6a (patch) | |
| tree | c2204d569f87e28bc2e48a763650e1b99871f0ed /src/plugins/git/gitclient.cpp | |
| parent | 328daa9c5aa9a438a0187bb28e238396451f8548 (diff) | |
| parent | b889bb1608badceed0dc1175f3322ea8015f8924 (diff) | |
| download | qt-creator-c3119d1aa70a25ab7aeb39b0448c1d10c08aba6a.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
src/plugins/qnx/qnxutils.cpp
Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 739b50fb57..80eddec1e0 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?"), @@ -3032,9 +3032,9 @@ bool GitClient::getCommitData(const QString &workingDirectory, static inline QString msgCommitted(const QString &amendSHA1, int fileCount) { if (amendSHA1.isEmpty()) - return GitClient::tr("Committed %n file(s).\n", 0, fileCount); + return GitClient::tr("Committed %n file(s).", 0, fileCount) + QLatin1Char('\n'); if (fileCount) - return GitClient::tr("Amended \"%1\" (%n file(s)).\n", 0, fileCount).arg(amendSHA1); + return GitClient::tr("Amended \"%1\" (%n file(s)).", 0, fileCount).arg(amendSHA1) + QLatin1Char('\n'); return GitClient::tr("Amended \"%1\".").arg(amendSHA1); } |