Commit 976c052c authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk

Git: Remove debug output

Change-Id: I5610ce9117c997a82ce8d28ff2440bebd28d9181
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 31ecec10
......@@ -2107,7 +2107,6 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,
// rebase conflict is output to stdOut
QRegExp conflictedCommit(QLatin1String("Patch failed at ([^\\n]*)\\n"));
conflictedCommit.indexIn(resp.stdOut);
qDebug() << conflictedCommit.cap(1);
handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
} else if (resp.stdErr.contains(QLatin1String("conflict"))) {
// cherry-pick/revert conflict is output to stdErr
......
Markdown is supported
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