Skip to content
Vincent Cantin edited this page Nov 24, 2013 · 2 revisions

This glossary will help you to understand the meaning which we associate to some terms used in this wiki.

Content

The data on which we apply the diff or merge tools.

Change

A modification of a content made by the user.

Difference

A comparison of a content before and after a change.

Diffelt

A new term created for this project. It is a contraction of the words difference and element, and it represents a basic element of difference.

Diffelts are to a difference what molecules are to matter: Small pieces which can be used to describe anything bigger.

In this project, a difference describes a change, and is composed by multiple diffelts.

Semantic difference:

A special case of difference, described by aspects related to semantic (by opposition to a difference related to non semantic aspects, like characters or lines).

Example of semantic difference: "a function has been moved".

Note: a semantic difference is not the same as a change in semantic, which is about the semantic of a content being changed.

Semantic description

The description of a change using semantic differences.

Clone this wiki locally