From 9791c1c39cb0bffbde7e751253ed93b0e97dc6f7 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 10 Nov 2012 23:09:33 +0100
Subject: [PATCH] Enable F5 refresh in RebaseDlg for conflicted files list

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseProc/RebaseDlg.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index 143eb4225..4d5e14e5e 100644
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -1681,6 +1681,12 @@ void CRebaseDlg::OnBnClickedRebasePostButton()
 
 void CRebaseDlg::Refresh()
 {
+	if (m_RebaseStage == REBASE_CONFLICT || m_RebaseStage == REBASE_SQUASH_CONFLICT)
+	{
+		ListConflictFile();
+		return;
+	}
+
 	if(this->m_IsCherryPick)
 		return ;
 
-- 
2.11.4.GIT