CLion 2016.2 Help

Diff & Merge

File | Settings | Tools | Diff & Merge for Windows and Linux
CLion | Preferences | Tools | Diff & Merge for OS X
Ctrl+Alt+S

settings

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

ItemDescription
Diff
Context linesUse the slider to specify the amount of context lines that will not collapse, when in a Differences viewer you click the button collapseAll to collapse the unchanged fragments.
Go to the next file after reaching last changeIf this check box is selected, CLion will suggest to click F7/ Shift+F7 once more and compare other files
Merge
Automatically apply non-conflicting changesIf this check box is selected, the interactive merge tool automatically merges all non-conflicting changes.

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

See Also

Last modified: 20 July 2016