From b63ae202e75f6abe82ea5d8eda224782b167cc0e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 17 Jun 2018 15:19:43 +0300
Subject: [PATCH] Git: Use nullptr in Mergetool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I93206f5d735f3b8b291d752faf6b7da77e98342e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
---
 src/plugins/git/mergetool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index 84cfea4dd12..2abba3e01fc 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -68,7 +68,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
         connect(m_process, &QIODevice::readyRead, this, &MergeTool::readData);
     } else {
         delete m_process;
-        m_process = 0;
+        m_process = nullptr;
         return false;
     }
     return true;