[gbpz]

I have a peer who says this is the greatest tool ever. I mostly just use IntelliJ for compare and merges, directories are seldom a problem.