PATCH: [ 964497 ] fix display of moved block in detail pane

diff --git a/Src/MergeDiffDetailView.cpp b/Src/MergeDiffDetailView.cpp
index 6af38cc..71c2bc7 100644 (file)
--- a/Src/MergeDiffDetailView.cpp
+++ b/Src/MergeDiffDetailView.cpp
@@ -162,7 +162,7 @@ void CMergeDiffDetailView::GetLineColors(int nLineIndex, COLORREF & crBkgnd,
        
        // Line with WinMerge flag, 
        // Lines with only the LF_DIFF/LF_TRIVIAL flags are not colored with Winmerge colors
-       if (dwLineFlags & (LF_WINMERGE_FLAGS & ~LF_DIFF & ~LF_TRIVIAL))
+       if (dwLineFlags & (LF_WINMERGE_FLAGS & ~LF_DIFF & ~LF_TRIVIAL & ~LF_MOVED))
        {
                crText = mf->m_options.GetInt(OPT_CLR_DIFF);
                bDrawWhitespace = TRUE;

diff --git a/Src/readme.txt b/Src/readme.txt
index 88d38a9..6502ecf 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2004-06-01 Laoran
+ PATCH: [ 964497 ] fix display of moved block in detail pane
+  Src: MergeDiffDetailView.cpp
+
 2004-06-02 Kimmo
  BUG: [ 964885 ] ColExtGet() returns extension converted to lowercase
   Src: DirViewColItems.cpp