From 182b2169ed65baa8c5f27fbf18cfc169b93d0cf6 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 17 Jul 2017 21:47:57 +0900 Subject: [PATCH] MergeDoc.cpp: Fix incorrect in-line diff coloring after swapping panes --- Src/MergeDoc.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index dec49f7de..e4457889b 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -2973,6 +2973,8 @@ void CMergeDoc::SwapFiles() m_diffList.Swap(0, m_nBuffers - 1); swap(m_pView[0]->m_piMergeEditStatus, m_pView[m_nBuffers - 1]->m_piMergeEditStatus); + ClearWordDiffCache(); + for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++) { m_ptBuf[nBuffer]->m_nThisPane = nBuffer; -- 2.11.0