3-way merge primitives (gix-merge low-level equivalent)
pub(all) struct ContentMergeOptions {
conflict_style : ConflictStyle
ours_label : String
base_label : String
theirs_label : String
marker_size : Int
favor : MergeFavor
}fn ContentMergeOptions::new(conflict_style? : ConflictStyle, ours_label? : String, base_label? : String, theirs_label? : String, marker_size? : Int, favor? : MergeFavor) -> ContentMergeOptionsfn ContentMergeOptions::with_labels(self : ContentMergeOptions, ours~ : String, base~ : String, theirs~ : String) -> ContentMergeOptionsfn ContentMergeOptions::with_marker_size(self : ContentMergeOptions, size : Int) -> ContentMergeOptionspub(all) struct ContentMergeResult {
content : String
has_conflicts : Bool
conflict_count : Int
}fn content_merge(base_text : String, ours_text : String, theirs_text : String, options : ContentMergeOptions) -> ContentMergeResult3-way merge primitives (gix-merge low-level equivalent)