two minor changes for PATCH: [ 813794 ] Fix "ignore blank lines"

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 4d2b7a7..cbc8bd4 100644 (file)
--- 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