MPS
 
2021.1
Shortcuts: Windows
Get MPS
You are viewing the documentation for an earlier version of MPS.
  1. Reference
  2. Settings / Preferences dialog
  3. Tools
  4. Diff & Merge

Diff & Merge

Last modified: 08 March 2021

File | Settings | Tools | Diff & Merge for Windows and Linux

MPS | Preferences | Tools | Diff & Merge for macOS

Ctrl+Alt+S the Settings/Preferences icon

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 Collapse all to collapse the unchanged fragments.
Go to the next file after reaching last changeIf this checkbox is selected, MPS will suggest to click F7/ Shift+F7 once more and compare other files
Merge
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 Apply not conflicts 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.