From 681362254917a71d589700108bfef7d3083d1a4f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 7 May 2011 02:48:18 +0200 Subject: [PATCH] set m_FileListCtrl.m_CurrentVersion to "" before starting rebase Signed-off-by: Sven Strickroth --- src/TortoiseProc/RebaseDlg.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index 20388b275..c9a1d5ae7 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -898,6 +898,7 @@ void CRebaseDlg::OnBnClickedContinue() return ; m_RebaseStage = REBASE_START; m_FileListCtrl.Clear(); + m_FileListCtrl.m_CurrentVersion = L""; m_ctrlTabCtrl.SetTabLabel(REBASE_TAB_CONFLICT, _T("Conflict Files")); m_ctrlTabCtrl.AddTab(&m_wndOutputRebase,_T("Log"),2); } -- 2.11.4.GIT