stringdiffs.cpp:The current diff3 algorithm does not correctly handle hunks when...

diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp
index 508bdf7..820f0ce 100644 (file)
--- a/Src/stringdiffs.cpp
+++ b/Src/stringdiffs.cpp
@@ -173,8 +173,8 @@ ComputeWordDiffs(int nFiles, const String str[3],
                else
                {
                        std::vector<wdiff> diffs10, diffs12;
-                       stringdiffs sdiffs10(str[1], str[0], case_sensitive, whitespace, breakType, &diffs10);
-                       stringdiffs sdiffs12(str[1], str[2], case_sensitive, whitespace, breakType, &diffs12);
+                       stringdiffs sdiffs10(str[1], str[0], case_sensitive, 0, breakType, &diffs10);
+                       stringdiffs sdiffs12(str[1], str[2], case_sensitive, 0, breakType, &diffs12);
                        // Hash all words in both lines and then compare them word by word
                        // storing differences into m_wdiffs
                        sdiffs10.BuildWordDiffList();