Module files
Source - ConflictDiffHunk
- Diff hunk that may be unresolved conflicts.
- DiffLine
- A diff line which may contain small hunks originating from both sides.
- DiffLineIterator
- DiffLineNumber
- DiffLineHunkSide
- Which side a
DiffLine hunk belongs to? - MergeResult
- Merge result in either fully-resolved or conflicts form, akin to
Result<BString, Vec<Merge<BString>>>.
- conflict_diff_hunks
- Iterator adaptor that translates non-conflict hunks to resolved
Merge. - merge
- Splits
inputs into hunks, resolves trivial merge conflicts for each, then
concatenates the outcome back to single Merge object. - merge_hunks
- Splits
inputs into hunks, resolves trivial merge conflicts for each. - try_merge
- Splits
inputs into hunks, attempts to resolve trivial merge conflicts for
each.