From 63f5bd4c1e262888fd85537e415155e628427f35 Mon Sep 17 00:00:00 2001 From: Laurent Ganier Date: Fri, 3 Oct 2003 17:29:46 +0000 Subject: [PATCH] two minor changes for PATCH: [ 813794 ] Fix "ignore blank lines" --- Src/MergeDoc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 4d2b7a79d..cbc8bd4ef 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -1705,7 +1705,7 @@ void CMergeDoc::PrimeTextBuffers() for (UINT i=curDiff.dbegin1; i <= curDiff.dend1; i++) { DWORD dflag = (curDiff.op == OP_DIFF) ? LF_DIFF : LF_TRIVIAL; - m_rtBuf.SetLineFlag(i, LF_DIFF, TRUE, FALSE, FALSE); + m_rtBuf.SetLineFlag(i, dflag, TRUE, FALSE, FALSE); } // insert blanks if needed -- 2.11.0