Comment by sanirank

I wish IntelliJ would sell git-only tool - their three way merge tool is the best I’ve used, and would gladly pay for a license.