MPS 2017.3 Help

Diff & Merge

File | Settings | Tools | Diff & Merge for Windows and Linux
MPS | Preferences | Tools | Diff & Merge for macOS
N/A settings

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

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 checkbox is selected, MPS will suggest to click N/A/ N/A once more and compare other files
Automatically apply non-conflicting changesIf this checkbox is selected, the interactive merge tool automatically merges all non-conflicting changes.

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

Highlight modified lines in gutterSelect 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: 10 January 2018