Commit 3f3554eb authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Display exit message for conflictable commands

Change-Id: I42d7a2e05a11ed4983063fc2577786e6c6d9b9a0
Reviewed-by: default avatarAndré Hartmann <>
Reviewed-by: default avatarTobias Hunger <>
parent e2aa0bbe
......@@ -3038,7 +3038,8 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,
// Disable UNIX terminals to suppress SSH prompting.
const unsigned flags = VcsBasePlugin::SshPasswordPrompt
| VcsBasePlugin::ShowStdOutInLogWindow
| VcsBasePlugin::ExpectRepoChanges;
| VcsBasePlugin::ExpectRepoChanges
| VcsBasePlugin::ShowSuccessMessage;
const SynchronousProcessResponse resp = synchronousGit(workingDirectory, arguments, flags);
ConflictHandler conflictHandler(0, workingDirectory, abortCommand);
// Notify about changed files or abort the rebase.
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