The 3-way merge editor became more robust, allowing developers to handle complex merge conflicts via --merge command-line options.
Visual Studio Code (VS Code) is the world's most popular code editor. Developed by Microsoft, it is free, open-source, and runs on multiple operating systems. visual studio code 1703 64 bits