From 1b52d8491a0c3c0e9bad1daa0fa586c49c9af75d Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 19 Nov 2018 07:57:56 +0900 Subject: [PATCH] MergeDoc.cpp: Fix github issue #106 File compare always showing different ending --- Src/MergeDoc.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index c4ae6e89e..27f35ccaa 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -2022,6 +2022,7 @@ void CMergeDoc::PrimeTextBuffers() m_diffList.ConstructSignificantChain(); +#if 0 // comment out to fix the github issue #106 // Buffers `m_ptBuf[]` may have a final line entry that is . // (a) If ALL buffers have that final , remove them all. // (b) If only SOME have that final , change those @@ -2062,6 +2063,7 @@ void CMergeDoc::PrimeTextBuffers() ASSERT(m_ptBuf[0]->GetLineCount() == m_ptBuf[file]->GetLineCount()); } } +#endif for (file = 0; file < m_nBuffers; file++) m_ptBuf[file]->FinishLoading(); -- 2.11.0