Glossary

The most important terms — in the order in which you encounter them in the manual.

Comparison (diff)

The juxtaposition of two versions with deviations marked in colour.

Merging

Taking individual blocks from one side to the other until the result is right (chapter 4).

Block

A contiguous group of differing lines. The arrows in the middle and the jumps with Ctrl+↓ always work block by block.

Tab

An open comparison. Several can be kept open side by side (chapter 2.2).

Formatting only

A difference the active filters consider meaningless — different indentation, for instance (chapter 5).

Moved

The same content in a different place. Gets a colour of its own so that reordered material does not look new (chapter 3.1).

Invisibles

Showing spaces as ·, tabs as → and line endings as ¶ / ↵ / ⏎ — makes invisible differences visible (chapter 3.4).

Regular expression (regex)

A search pattern. In MergeQaiPro you click it together from building blocks instead of writing it (chapter 6).

Rule set

A saved collection of regex rules, retrievable under a name (chapter 6.4).

Base

In a three-way comparison the common starting version — and at the same time the result that gets saved (chapter 7).

Conflict

Both sides changed the same place differently. Here a human decides (chapter 7.2).

Folder pair

Two differently named directories that MergeQaiPro treats as the same, because their contents overlap most strongly (chapter 8.2).

Exclusion

A folder or file left out of the folder comparison — individually or via presets (chapter 8.4).

Difference image

An image formed from the deviation between two pictures: black means equal, bright places show differences (chapter 9.1).

Hex view

Displaying a file byte by byte in hexadecimal notation (chapter 10).

Offset

The position of a byte within the file, counted from zero. In the hex view it stands on the left of every line (chapter 10.2).

Range of deviation

A contiguous stretch of deviating bytes. The arrows in the binary comparison jump from one to the next (chapter 10.1).

Map

The narrow strip along the right edge of the binary comparison: it depicts the whole file and shows where the deviations lie (chapter 10.1).