1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/mercurial/mercurialjobrunner.cpp b/src/plugins/mercurial/mercurialjobrunner.cpp
index 185856a16d..5651868282 100644
--- a/src/plugins/mercurial/mercurialjobrunner.cpp
+++ b/src/plugins/mercurial/mercurialjobrunner.cpp
@@ -69,6 +69,11 @@ HgTask::HgTask(const QString &repositoryRoot,
 {
 }
 
+VCSBase::VCSBaseEditor* HgTask::displayEditor() const
+{
+    return editor;
+}
+
 void HgTask::emitSucceeded()
 {
     emit succeeded(m_cookie);
@@ -221,7 +226,7 @@ void MercurialJobRunner::task(const QSharedPointer<HgTask> &job)
           */
         if (stdOutput.isEmpty())
             stdOutput = stdErr;
-        emit output(stdOutput);
+        emit output(stdOutput); // This will clear the diff "Working..." text.
         taskData->emitSucceeded();
     } else {
         emit error(QString::fromLocal8Bit(stdErr));