Comment by kodisha

I REALLY love the way merge tool works in IntelliJ IDEA.

Is there some other tool out there that works in a similar way, and that good?

(tho, typing idea . and doing a merge fix is not that bad)