I use IntelliJ as my git diff and git merge tool. Requires this kind of conf: https://gist.github.com/rambabusaravanan/1d1902e599c9c680319678b0f7650898 https://

I use IntelliJ as my git diff and git merge tool. Requires this kind of conf: https://gist.github.com/rambabusaravanan/1d1902e599c9c680319678b0f7650898 https://gist.github.com/rambabusaravanan/1d1902e599c9c680319...