diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 07c7bc6c834..351108acdba 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2107,12 +2107,12 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,
         GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
     } else if (resp.stdOut.contains(QLatin1String("CONFLICT"))) {
         // rebase conflict is output to stdOut
-        QRegExp conflictedCommit(QLatin1String("Patch failed at ([^\\n]*)\\n"));
+        QRegExp conflictedCommit(QLatin1String("Patch failed at ([^\\n]*)"));
         conflictedCommit.indexIn(resp.stdOut);
         handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
     } else if (resp.stdErr.contains(QLatin1String("conflict"))) {
         // cherry-pick/revert conflict is output to stdErr
-        QRegExp conflictedCommit(QLatin1String("could not (?:apply|revert) (.*)$"));
+        QRegExp conflictedCommit(QLatin1String("could not (?:apply|revert) ([^\\n]*)$"));
         conflictedCommit.indexIn(resp.stdErr);
         handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
     }