Skip to content

Releases: zawys/vscode-as-git-mergetool

v0.14.0

07 Apr 15:03
Compare
Choose a tag to compare

Added

  • Command to run the initial settings assistant on demand.

Changed

  • Initial settings assistant
    • Fixes. It now aggregates the decisions and allows to apply them at the end.
    • The settings assistant startup is now rather configured per repository.
    • Malfunctioning creation of backup setting entries
      was replaced by creating a log file of changes made.
    • The messages were improved.
  • Switched to Webpack as bundler

Fixed

  • Wrong file paths were opened when git mergetool was launched
    by the extension.

v0.13.3

21 Feb 22:51
Compare
Choose a tag to compare

Fixed

  • Fixed ascertaining of the git path.
    The bug was introduced in 0.13.1 by a too aggressive search-and-replace.

v0.13.2

21 Feb 21:32
Compare
Choose a tag to compare

Fixed

  • Unfortunately, working around the bug mentioned in section 0.13.1
    unveiled that the parcel bundler seems to contain more bugs.
    Thus, for a quick&dirty fix, this release is the previous release
    with almost all dependencies as in version 0.11.0.
  • Fixed command IDs.
    The bug was introduced in 0.13.1 by a too aggressive search-and-replace.

v0.13.1

21 Feb 14:07
Compare
Choose a tag to compare

Fixed

  • The extension went into an exception at runtime due to a
    bug in the Parcel bundler.
    This prevented the extension from loading entirely.
    I did not notice this until I tried to use my extension myself
    because running the extension from the repository worked without flaws.
    So if you were disappointed, please consider creating a bug report next time.

v0.13.0

06 Feb 17:03
Compare
Choose a tag to compare

Added

  • Save initially changed configuration values into backup entries

v0.12.0

06 Feb 16:30
Compare
Choose a tag to compare

Fixed

  • Texts of notifications from initial settings assistant

v0.11.0

19 Dec 14:58
Compare
Choose a tag to compare

Added

  • Layout 3DiffToMerged diffing current, base, and remote to the merged version.
    This seems to be the best solution for merges
    where the changes in both versions are similar,
    e.g. for merging already partially cherry-picked branches
    or half-applied stashes.

Changed

  • Minor: Diff editor titles have been unified to always contain
    the name of the previous version of the comparison.

v0.10.0

08 Sep 23:25
Compare
Choose a tag to compare

Changed

  • The "next merge step" command introduced in v0.4.0
    is now assigned to the check mark button in the status bar.

v0.9.0

05 Sep 21:33
Compare
Choose a tag to compare

Added

  • Status bar items for zooming
  • Make diffed files except merge result readonly.

v0.8.0

05 Sep 15:47
Compare
Choose a tag to compare

Note

I have rebuilt and re-signed the packages of versions v0.6.0–v0.7.2
as in these packages were files which I did not want to publish.
As it is
impossible to unpublish a specific version
on the Marketplace,
I needed to temporarily completely purge the project from the Marketplace.
If—against my hope—that should have caused any trouble, please file an issue.

Added

  • Zoom: Quickly change the layout proportions using keyboard shortcuts:
    shift+alt+m ↑, shift+alt+m ↓, etc.; shift+alt+m backspace to reset.