VSCode

Using Visual Studio Code as Git merge tool