

The differences are displayed in the Differences Viewer for Folders: IntelliJ IDEA lets you compare files in two folders against their file size, content, or timestamp. Refer to Compare files from the command line for more information. You can compare two or three files from the command line and use IntelliJ IDEA as an external diff tool. When you are comparing two files, or a file with the Cliboard contents, you can swap sides by clicking on the toolbar. To assign shortcuts to the accept and append actions, open the Keymap page of the IDE settings Ctrl+Alt+S and locate these actions under Version Control Systems | Diff & Merge.

Productivity tips Assign shortcuts for 'accept' and 'append' Select a modified file anywhere in the Version Control tool window.
