Reference

ts

import { diffLines, draftOf, patchOf, splitBlocks, splitLines } from '@adecore/merge';

Limits

Limit	Value	What happens past it	Explained in
Edits in one diff	4000, fixed	The changed middle becomes one change, or one `coarse` hunk in `patchOf`	Lines and diffs
Changed lines in a hunk	4000	The hunk gets `coarse: true`	Patches
`maxWork` of `patchOf`	None unless you pass one	The unmatched middle becomes one `coarse` hunk	Patches
Line length for `wordChanges`	Very long lines	It returns `null`	Diff rows

Block kinds

`MergeBlockKind`	Merges to
`stable`	Ours
`ours`	Ours
`theirs`	Theirs
`both`	Ours, once
`conflict`	Nothing until someone answers

Three-way merge explains each kind.

Exports

Every name @adecore/merge exports, read from its source. Anything not listed is internal and may change in any release.

`@adecore/merge`

Lines, diffs, patches, diff rows and displays, and the three-way merge.

Name	Kind	Source
`diffLines`	function	`diff`
`Change`	type	`diff`
`splitBlocks`	function	`blocks`
`MergeBlock`	type	`blocks`
`MergeBlockKind`	type	`blocks`
`bothLines`	function	`resolve`
`draftOf`	function	`resolve`
`fingerprint`	function	`resolve`
`sideLines`	function	`resolve`
`wandLines`	function	`resolve`
`MergeDraft`	type	`resolve`
`MergeSide`	type	`resolve`
`MergeSpan`	type	`resolve`
`joinLines`	function	`text`
`shapeOf`	function	`text`
`splitLines`	function	`text`
`TextShape`	type	`text`
`missingSides`	function	`patch`
`patchFits`	function	`patch`
`parsePatch`	function	`patch-parser`
`parseHunkHeader`	function	`patch-parser`
`HunkHeader`	type	`patch-parser`
`Hunk`	type	`patch-parser`
`ParsedPatch`	type	`patch-parser`
`PatchLine`	type	`patch-parser`
`diffDocument`	function	`diff-document`
`diffRows`	function	`diff-document`
`DiffDocument`	type	`diff-document`
`DiffGapRow`	type	`diff-document`
`DiffLineRef`	type	`diff-document`
`DiffLineRow`	type	`diff-document`
`DiffRow`	type	`diff-document`
`patchOf`	function	`patch-of`
`wordChanges`	function	`word-changes`
`DiffWordRange`	type	`word-changes`
`diffDisplay`	function	`diff-display`
`DiffDisplay`	type	`diff-display`
`DiffDisplayGap`	type	`diff-display`
`diffSplit`	function	`diff-split`
`DiffSplit`	type	`diff-split`
`DiffSplitRow`	type	`diff-split`
`sourceLineOf`	function	`diff-source`
`DiffSourceLine`	type	`diff-source`