I use IntelliJ as my git diff and git merge tool. Requires this kind of conf: ht...

lolive on May 26, 2020 | parent | context | favorite | on: Sublime Merge 2

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