Plugin v.1.4.0

Changelog

MAJOR

• Reworked the Diff and Merge Dialogs
  • The conflict resolution dialog for one file now has the dialog options "Accept Yours" and "Accept Theirs"
  • The used whitespace treatment is shown in both the Diff and Merge Dialogs
  • Diff and Merge now show changes on a word-basis instead of only line-based. This is represented by using two different shades of color: A brighter one for the lines, a darker one for the individual changed words
  • Because of the word-based resolution on changes, some changes that were conflicts in a Merge can now be resolved
  • Conflicting changes are now calculated such that the conflicting changes affect the same lines in the fork-point
  • Accepting both sides of a conflict now results in the second accepted side being appended after the first side, instead of overwriting it
  • If there are two changes that are identical (one from each side), accepting one automatically sets the other as accepted as well. Those changes are not marked as conflicting
  • Improved the visuals of the Merge and Diff dialog

MINOR

• The whitespace treatment used for diffs and merges can be set in the git settings