[ 771625 ] regression for patch [765399]

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index eb86bc1..c66a6de 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -129,8 +129,7 @@ BOOL CMergeEditView::PrimeListWithFile()
 
        SetWordWrapping(FALSE);
        ResetView();
-       // RecalcVertScrollBar is done during ScrollToLine
-       //RecalcVertScrollBar();
+       RecalcVertScrollBar();
        SetTabSize(mf->m_nTabSize);
 
        ScrollToLine(nResumeTopLine);

diff --git a/Src/readme.txt b/Src/readme.txt
index 1b80682..782ae56 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-07-15 Laoran
+ PATCH: [ 771625 ] regression for patch [765399]
+  WinMerge: MergeEditView.cpp 
+
 2003-07-15 Perry
  PATCH: [ 770361 ] Slovak translation
   Languages: New Slovak subdirectory