I think its a step down from Beyond Compare, I've set that up as the diff tool in Intellij before, I might have to do that again in my current environment.