From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 9 Feb 2020 23:14:19 +0000 (+0900)
Subject: stringdiffs.cpp:The current diff3 algorithm does not correctly handle hunks when... 
X-Git-Tag: 2.16.6~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ad3f9f137cd7dcd3e5946066e223fc0cd594cd7b;p=winmerge-jp%2Fwinmerge-jp.git

stringdiffs.cpp:The current diff3 algorithm does not correctly handle hunks when ignore_space_change or ignore_all_space is enabled. Therefore, ignore this flag.
---

diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp
index 508bdf7b9..820f0ce92 100644
--- 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();