4 sub-windows (when you really only need 3), a lot of different colors and even more confusing result-window. No links what has changed between versions and and the result. It clearly shows it's dated or rather outdated. Great if you ever need to do a command line merge, otherwise it sucks.
IDEA places an emphasis in safe refactoring, offering a variety of features to make this possible for a variety of languages. These features include safe delete, type migration and replacing method code duplicates.
Three comparison panes with horizontal and vertical layouts Integrates with version control systems as the merging tool for conflicting file revisions Non-conflicting changes are merged automatically Merging conflicts are highlighted One-click conflict resolution with a mouse button