DiffObject

DiffObject[v, type, data]

represents a sequence of diffs for transforming objects of the indicated type.

Details

DiffObject can be generated by Diff and Diff3.
Recognized types include "Elements", "Characters", "Words", "Lines", "Cells" and "Notebooks".
Types for three-way comparisons are {"Elements", 3}, {"Characters", 3}, etc.
The data argument is an Association that contains detailed information about the diffs and metadata about the comparison that generated them.
When displayed, a typical DiffObject will show a representation of the diffs and an interface to explore them.
If obj is a DiffObject, then obj[prop] will return the value of the requested property, and obj[{prop₁, prop₂, …}] will return an association of the requested property values.
Available properties include:

	"Properties"	list of avaialble property names
	"Type"	the type
	"Changes"	the raw change data
	"Matches"	changes that represent matching elements
	"Insertions"	changes that represent insertions
	"Deletions"	changes that represent deletions
	"Edits"	changes that represent edited elements
	"Conflicts"	changes that conflict
	"SummaryString"	a brief summary of the changes
	"LabeledChanges"	labeled changes
	"MetadataInfo"	additional information
	"DefaultFormat"	the name of the default format for this object
	"Formats"	a list of formats supprted for this object

If obj is a DiffObject that supports the format fmt, then obj[fmt] will display it.

open allclose all

Extract information about diffs from a DiffObject:

Get a summary of a DiffObject:

If Diff3 finds a conflict, that will be reflected in the DiffObject:

Individual changes representing a conflict can be extracted from a DiffObject:

The list of available formats can change from one DiffObject to another:

Return a variety of data and formatting for a given DiffObject:

DiffApply applies a DiffObject to an expression:

If a DiffObject has a version number or a structure that is not recognized by your current paclet, its formatting will reflect that:

Top