BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect

diff --git a/Src/Changes.txt b/Src/Changes.txt
index f5314f6..9ecaa8b 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -6,6 +6,8 @@ Add new items to top.
  PATCH: [ 1544147 ] Add Install-feature for file filters
   Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
   Src/Languages/*: Merge*.rc
+ BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
+  Src: MergeDoc.cpp
 
 2006-08-20 Kimmo
  PATCH: [ 1424673 ] Widen labels on OpenDialog

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 1200c2c..8eb7524 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -2772,7 +2772,6 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file
                {
                        diffOptions.bIgnoreEol = TRUE;
                        m_diffWrapper.SetOptions(&diffOptions);
-                       GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_EOL, true);
                }
        }