Plugin v.1.4.2

Changelog

MAJOR

• If a file was added to both branches or commits in a merge with different content, the plugin now creates an artificial text for the fork-point that contains the lines that both versions have in common

MINOR

• The mechanism determining the scrolling behaviour in a merge or diff now re-calculates the heights on the first scroll or mouseevent - this should make it so that the scrolling actually works as intended
• If a file was DELETED on one branch and MODIFIED on another, the DELETE change is now only marked as background highlight, this makes it easier to spot the changed done on the MODIFIED side

BUGFIXES

• The "OK" button in the merge dialog is only enabled if all conflicts were resolved
• If a part of a MODIFY change stretches more than one line, only the actually changed words are highlighted instead of the whole lines
• Fixed several bugs with ADD or DELETE type changes in merge conflicts
• Fixed the first pull failing when connecting to a new remote and using HTTPS as auth method