Categorygithub.com/nasdf/diff3
modulepackage
1.0.0
Repository: https://github.com/nasdf/diff3.git
Documentation: pkg.go.dev
Overview
Versions
2
Dependencies
3
Dependents
1
Files
115 SLOC

# README

Diff3

A diff3 text merge implementation in Go based on the awesome paper below.

"A Formal Investigation of Diff3" by Sanjeev Khanna, Keshav Kunal, and Benjamin C. Pierce

Usage

import "github.com/nasdf/diff3"
textO := "original"
textA := "changesA"
textB := "changesB"
merge := diff3.Merge(textO, textA, textB)

Customize seperators

diff3.Sep1 = "$$$$$$$"
diff3.Sep2 = "@@@@@@@"
diff3.Sep3 = "*******"

Customize DiffMatchPatch settings

diff3.DiffMatchPatch.DiffTimeout = time.Second
diff3.DiffMatchPatch.DiffEditCost = 4
diff3.DiffMatchPatch.MatchThreshold = 0.5
diff3.DiffMatchPatch.MatchDistance = 1000
diff3.DiffMatchPatch.PatchDeleteThreshold = 0.5
diff3.DiffMatchPatch.PatchMargin = 4
diff3.DiffMatchPatch.MatchMaxBits = 32

License

MIT

# Functions

Merge implements the diff3 algorithm to merge two texts into a common base.

# Constants

Sep1 signifies the start of a conflict.
Sep2 signifies the middle of a conflict.
Sep3 signifies the end of a conflict.

# Variables

DiffMatchPatch contains the diff algorithm settings.