Visual Studio Code is a neat editor with many good functionalities but I especially like the way it shows Git merge conflicts. Instead of a 2-way or a 3-way split it just shows one window with both changes, nicely highlighted with colors and actions.
I like this feature so much I decided to set Visual Studio Code as my Git merge tool for both the command line and Git Tower.
Using Visual Studio Code as a merge tool for Git when using command line means editing your
.gitconfig. You just need to define a new tool called
code and set it as the default merge tool.
[merge] tool = vscode [mergetool "vscode"] cmd = code --wait $MERGED