IntelliJ-IDEA as git mergetool
The git mergetool command allows you to resolve merge conflicts from your command line. Many merge...
Tags: todayilearned, git, java, tooling