From 3f9c599f7adaf561367bf818ed2b2a34fe3095f2 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Sun, 11 Nov 2012 19:43:12 +0800
Subject: [PATCH] Can also refresh Rebase dialog by double clicking to delete
 conflict file

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/Git/GitStatusListCtrl.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp
index b793bc439..733a633b7 100644
--- a/src/Git/GitStatusListCtrl.cpp
+++ b/src/Git/GitStatusListCtrl.cpp
@@ -2544,8 +2544,12 @@ void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
 	}
 	if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
 	{
-		CAppUtils::ConflictEdit(*file,false,m_bIsRevertTheirMy);
-
+		if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy))
+		{
+			CString conflictedFile = g_Git.m_CurrentDir + _T("\\") + file->GetWinPathString();
+			if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
+				GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
+		}
 	}
 	else
 	{
-- 
2.11.4.GIT