bit_diff3

3-way merge primitives (gix-merge low-level equivalent)

git
merge
diff3
moon add mizchi/bit_diff3@0.46.4
Download zip
Author
Version
0.46.4
License
Apache-2.0
Last updated
4 days ago
Downloads
495
README

#
ConflictStyle

pub(all) enum ConflictStyle {
Merge
Diff3
}

#
ContentMergeOptions

pub(all) struct ContentMergeOptions {
conflict_style : ConflictStyle
ours_label : String
base_label : String
theirs_label : String
marker_size : Int
favor : MergeFavor
}

#
ContentMergeOptions::default

#
ContentMergeOptions::favor_ours

#
ContentMergeOptions::favor_theirs

#
ContentMergeOptions::favor_union

#
ContentMergeOptions::new

fn ContentMergeOptions::new(conflict_style? : ConflictStyle, ours_label? : String, base_label? : String, theirs_label? : String, marker_size? : Int, favor? : MergeFavor) -> ContentMergeOptions

#
ContentMergeOptions::with_diff3

#
ContentMergeOptions::with_labels

fn ContentMergeOptions::with_labels(self : ContentMergeOptions, ours~ : String, base~ : String, theirs~ : String) -> ContentMergeOptions

#
ContentMergeOptions::with_marker_size

fn ContentMergeOptions::with_marker_size(self : ContentMergeOptions, size : Int) -> ContentMergeOptions

#
ContentMergeResult

pub(all) struct ContentMergeResult {
content : String
has_conflicts : Bool
conflict_count : Int
}

#
MergeFavor

pub(all) enum MergeFavor {
NoFavor
FavorOurs
FavorTheirs
FavorUnion
}

#
content_merge

fn content_merge(base_text : String, ours_text : String, theirs_text : String, options : ContentMergeOptions) -> ContentMergeResult

#
is_binary_content

fn is_binary_content(data : Bytes) -> Bool

Source Files

Powered by MoonBit

Site sourceReport issuePackagesBuild queueSkillsStatistics

© 2026 mooncakes.io