#2965 match similar lines

GUI (476)

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).


  • Matthias

    Matthias - 2010-07-29
    • milestone: --> Trunk
    • labels: --> GUI
  • Matthias

    Matthias - 2010-08-01

    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.

  • Jochen Tucht

    Jochen Tucht - 2012-05-28

    Adopted for WinMerge 2011, except for the matchcost patch (#2), which I'm a bit undecided about.

  • Christian List

    Christian List - 2013-03-02
    • milestone: Trunk --> Future

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

No, thanks