Commit 541e6161 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Fix rebase issue and warning

Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef

Reviewed-by: default avatarTobias Hunger <>
parent 363b230a
......@@ -1255,7 +1255,7 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory,
// Factory function to create an asynchronous command
GitCommand *GitClient::createCommand(const QString &workingDirectory,
VCSBase::VCSBaseEditorWidget* editor,
bool outputToWindow,
bool useOutputToWindow,
int editorLineNumber)
GitCommand *command = new GitCommand(gitBinaryPath(), workingDirectory, processEnvironment(), QVariant(editorLineNumber));
......@@ -106,6 +106,7 @@ GitSettings &GitSettings::operator = (const GitSettings &s)
VCSBaseClientSettings::operator =(s);
return *this;
} // namespace Internal
Supports Markdown
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