Releases: zawys/vscode-as-git-mergetool
Releases · zawys/vscode-as-git-mergetool
v0.14.0
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
v0.13.2
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
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
v0.12.0
v0.11.0
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
v0.9.0
v0.8.0
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.