Skip to content
Permalink
Browse files

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.
  • Loading branch information
sdottaka committed Feb 9, 2020
1 parent dd070f6 commit ad3f9f137cd7dcd3e5946066e223fc0cd594cd7b
Showing with 2 additions and 2 deletions.
  1. +2 −2 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();

0 comments on commit ad3f9f1

Please sign in to comment.
You can’t perform that action at this time.