- diff object¶
A diff object represents the difference
B-Abetween two objects,
B, as a list of operations (ops) to apply to
- merge decision¶
An object describing a part of the merge operation between two objects with a common base. Contains both the information about local and remote changes, and the decision taken to resolve the merge.