pub fn merge_hunks<T: AsRef<[u8]>>(inputs: &Merge<T>) -> MergeResult
Expand description
Splits inputs
into hunks, resolves trivial merge conflicts for each.
Returns either fully-resolved content or list of partially-resolved hunks.
pub fn merge_hunks<T: AsRef<[u8]>>(inputs: &Merge<T>) -> MergeResult
Splits inputs
into hunks, resolves trivial merge conflicts for each.
Returns either fully-resolved content or list of partially-resolved hunks.