Menu
▾
▴
Code Merge Request #3: Fixes to alignment algorithm (merged)
Merging...
Merged
Something went wrong. Please, merge manually
Checking if merge is possible...
Something went wrong. Please, merge manually
Maurice van der Pot wants to merge 0 commits from /u/griffon26/kdiff3/ to master, 2014-09-02
When a line in B is not at the same position as the matching line in C, calcDiff3LineListUsingBC will move up the lines upto that line in B. The changes in this merge request make sure that also lines in A that match B (and everything before them) is moved up along with the lines in B. The same is done when lines in C are moved up.
Additionally some improvements were made (most of them in calcDiff3LineListTrim) to make sure that equality booleans such as bAEqC are set when they should be. This improves alignment further by not separating lines that are actually the same.
| Commit | Date |
|---|
Don't know what happened to this request. 0 commits? Not what I had in mind. Hang on while I fix this.
Edit: Apparently sourceforge was slow and the merge request is fine.
Last edit: Maurice van der Pot 2014-08-25