I tried the same operation of merging a branch on the current one, first using Intelllj and then from command line using 'git merge' (on two different repos of the same project). I noticed that the merge conflicts presented by git are simpler than with the merge tool of Intellij. It looks like when git is used from command line, it does more automatic merging before asking the user to sort out things.
Are there different algorithms at work? And how do they differ?
I'm running intellij 14.1.5.