diffy

Function merge_bytes

source
pub fn merge_bytes<'a>(
    ancestor: &'a [u8],
    ours: &'a [u8],
    theirs: &'a [u8],
) -> Result<Vec<u8>, Vec<u8>>
Expand description

Perform a 3-way merge between potentially non-utf8 texts