match similar lines
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
#2965 match similar lines
In basic there was a misstake in insert ghostlines, as if the func found a ghost needed, it doesn't break. (MergeDocDiffSync1_7227.patch)
Than I inproved the matchcost (MergeDocDiffSync2_7227.patch).
As I need sometimes more detail. I opened the limitation of lines(15) to be adjustable. (MergeDocDiffSync3_7227.patch)
See all three patched are seperated, no connection to each other.
At the linit of 500 I also stop rescan inside the doc only, so mergeing goes faster(from end to begin).
inserst of ghostlines
matchcost
sped up
adjust numbers of lines
I added patch4 that speed up the func by using an array. So all match are done only once. The other func will take the stored value of match, that speed up a lot.
I changed patch3, by adding some missing lines for confic.log files.
Adopted for WinMerge 2011, except for the matchcost patch (#2), which I'm a bit undecided about.