for Windows and Linux
for OS X
⌘, or ⌘,⌘, or ⌘,⌘, or ⌘,⌥ F7, ⌥F7 or ⌥F7^ ⌥ S, ⌃⌥S or ⌃⌥S
On this page, specify the default behavior of the Differences viewer.
| Item | Description |
|---|---|
| Diff | |
| Context lines | Use the slider to specify the amount of context lines that will not collapse, when in a Differences viewer
you click the button  to
collapse the unchanged fragments. |
| Go to the next file after reaching last change | If this check box is selected, IntelliJ IDEA will suggest to click F7 or F7F7 or F7⌃F7 or ⌃F7F7, F7 or F7F7, F7 or F7/ ⇧F7 or ⇧F7⇧F7 or ⇧F7⇧F7 or ⇧F7⇧ F7, ⇧F7 or ⇧F7⇧ F7, ⇧F7 or ⇧F7 once more and compare other files |
| Merge | |
| Automatically apply non-conflicting changes | If this check box is selected, the interactive merge tool automatically merges all non-conflicting changes.
This is an equivalent to clicking |
| Highlight modified lines in gutter | Select this check box if you want added/modified lines (relative to the base revision) to be highlighted in the gutter of the Merge dialog. |
in the