VSCode releases new 3-way merge editor as default. Bad movegithub.com/microsoft2 pointslinearza4 years ago