Diff & Merge
for Windows and Linux
for OS X
Ctrl+Alt+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/ Shift+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 |
in the See Also
Last modified: 5 September 2016