Only reason I use VSCode these days is Git Merge Editor.