Sublime Merge includes powerful features like an integrated git merge tool, the ability to search for specific commits, command line integration, code and file history, and syntax highlighting.

Git Extensions includes an extension for Visual Studio versions going back to 2005. There's also the Visual Studio Tools for Git extension created by the Team Foundation Server (TFS) Power Tools Team ...

The merge editor, meanwhile, received polishing as well as bug fixes and new features. In VS Code 1.73, both Accept Incoming and Accept Current can always be selected.