PATCH: [ 876546 ] Fix CMergeDoc::CDiffTextBuffer::SaveToFile ghost line detect

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index d7620a8..594e44a 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1371,7 +1371,7 @@ int CMergeDoc::CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
                int nLineCount = m_aLines.GetSize();
                for (int line=0; line<nLineCount-1; ++line)
                {
-                       if (GetLineFlags(line) && LF_GHOST)
+                       if (GetLineFlags(line) & LF_GHOST)
                                continue;
                        if (GetLineLength(line) > 0)
                                GetText(line, 0, line, GetLineLength(line), sLine, 0);

diff --git a/Src/readme.txt b/Src/readme.txt
index 4381eb4..0daa514 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2004-01-13 Perry
+ PATCH: [ 876546 ] Fix CMergeDoc::CDiffTextBuffer::SaveToFile ghost line detect
+  src/WinMerge: MergeDoc.cpp
+
 2004-01-13 Jochen
  Start Merge7z integration (to be continued)
   src: 7zCommon.cpp 7zCommon.h DirView.h