CLion 2019.1 Help

Diff & Merge

File | Settings | Tools | Diff & Merge for Windows and Linux
CLion | Preferences | Tools | Diff & Merge for macOS
Ctrl+Alt+S the Settings/Preferences icon

On this page, specify the default behavior of the Differences viewer.




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 icons actions collapseall svg to collapse the unchanged fragments.

Go to the next file after reaching last change

If this checkbox is selected, CLion will suggest to click F7/ Shift+F7 once more and compare other files


Automatically apply non-conflicting changes

If this checkbox is selected, the interactive merge tool automatically merges all non-conflicting changes.

This is an equivalent to clicking icons diff applyNotConflicts in the Merge dialog.

Highlight modified lines in gutter

Select this checkbox if you want added/modified lines (relative to the base revision) to be highlighted in the gutter of the Merge dialog.

Last modified: 24 July 2019

See Also