From c4473510cc20321877f4402c6657577998adca16 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 12 Aug 2020 22:24:39 +0900
Subject: [PATCH] MergeEditView.cpp: Fix a warning

---
 Src/MergeEditView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index c046affd4..e3c16eccf 100644
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -395,7 +395,7 @@ void CMergeEditView::GetFullySelectedDiffs(int & firstDiff, int & lastDiff, int
 		
 		if (pd->EqualCurrentWordDiff(m_nThisPane, ptStart, ptEnd))
 		{
-			firstWordDiff = lastWordDiff = pd->GetCurrentWordDiff().nWordDiff;
+			firstWordDiff = lastWordDiff = static_cast<int>(pd->GetCurrentWordDiff().nWordDiff);
 		}
 		else if (ptStart != ptEnd)
 		{
-- 
2.11.0