Module tree_merge 

Merge trees by recursing into entries (subtrees, files)

Structs

MergeOptions

Options for tree/file conflict resolution.

Functions

merge_trees

The returned conflict will either be resolved or have the same number of sides as the input.

resolve_file_values

Tries to resolve file conflicts by merging the file contents. Treats missing files as empty. If the file conflict cannot be resolved, returns the passed values unmodified.