feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Remove debug output

Browse Source 
Change-Id: I5610ce9117c997a82ce8d28ff2440bebd28d9181
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Orgad Shaneh
2013-02-13 21:53:29 +02:00
committed by hjk
parent 31ecec10a8
commit 976c052c0b
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/gitclient.cpp
View File

@@ -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