Have HPP files with merge conflicts open in file display window. Attempt to open the HPP file using the "Resolve with Merge Editor" button in the bottom right. The file should open, as it is there in ...

Adds Sublime Merge commands to VSCode/VSCodium. To differentiate between other Sublime Merge plugins, this one isn't concerned with what workspace (multi or single) you have setup. Whatever file you ...