jj_lib::files

Function conflict_diff_hunks

Source 
pub fn conflict_diff_hunks<'input, I>(
    diff_hunks: I,
    num_lefts: usize,
) -> impl Iterator<Item = ConflictDiffHunk<'input>>
where
    I: IntoIterator,
    I::Item: Borrow<DiffHunk<'input>>,
Expand description

Iterator adaptor that translates non-conflict hunks to resolved Merge.

Trivial conflicts in the diff inputs should have been resolved by caller.