Versions in this module Expand all Collapse all v0 v0.0.0 Aug 1, 2022 Changes in this version + type Conflict struct + type Diff3MergeResult struct + func Diff3Merge(a, o, b []string, excludeFalseConflicts bool) []*Diff3MergeResult + type MergeResult struct + Conflicts bool + Result io.Reader + func Merge(a, o, b io.Reader, detailed bool, labelA string, labelB string) (*MergeResult, error)
Go to main page