News
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.
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.
Some results have been hidden because they may be inaccessible to you
Show inaccessible results