IntelliJ IDEA 11.1 Web Help

This dialog is displayed every time you explore differences between files (local history for folders, recent changes, version control, local files and their versions on a remote host, or just comparing files). So doing, you can compare files of any types, including binaries.

Tip

You can also open the difference viewer without running IntelliJ IDEA. This is done through the following command:

<path to IntelliJ IDEA executable file> diff <path_1> <path_2>

where path_1 and path_2 are paths to the files in question, which can be of various types, including jar.

The differences viewer provides a powerful editor that enables code completion, live templates etc.

Item Tooltip and Shortcut Description
copy Ctrl+C Command C or Ctrl+Insert Command Insert Click this button to copy the line at caret in the right pane to the Clipboard.
find Ctrl+F Command F or Alt+F3 Alt F3 Click this button to initiate Finding text procedure and locate the specified string in the current file.
arrowDown or arrowUp F7F7 or Shift+F7Shift F7 Click this button to move to next / previous difference.
Ignore whitespace Use this drop-down list to define how the differences viewer should treat white spaces in the text.
  • Do not ignore: white spaces are important, and the differences should be highlighted.
  • Leading and Trailing: Ignore the differences, if they appear in the end and in the beginning of a line.
  • All: white spaces are not important, regardless of their location in the source code.
comparePreviousFile Compare Previous File
Alt+LeftControl Left		 Click this button to compare the local copy of the previous file with its update from the server.

Note

The button is available only when the Differences Viewer is invoked from the Update Project Info tab of the Version Control tool window or from the Apply Patch dialog box.

compareNextFile Compare
Next File
Alt+RightControl Right		 Click this button to compare the local copy of the next file with its update from the server.

Note

The button is available only when the Differences Viewer is invoked from the Update Project Info tab of the Version Control tool window or from the Apply Patch dialog box.

Legend Shows summary information about the encountered differences: number of differences found, and color map.

Tip

Color map for the Differences viewer is configurable in the Colors and Fonts dialog box.

icon_InsertReplace icon_InsertReplace2 Use these chevron buttons to apply differences between panes.

See Also

Concepts:

Procedures:

Reference:

Web Resources: