From 3f3554eb130a4af322a9ec3f30d7080df3075639 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 22 Sep 2014 11:56:39 +0300
Subject: [PATCH] Git: Display exit message for conflictable commands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I42d7a2e05a11ed4983063fc2577786e6c6d9b9a0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/gitclient.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 743a7065a29..af437ef2d1b 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -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.