Module conflicts 

Structs

ConflictFileEntry

ConflictRecord

Functions

cleanup_resolved

Clean up all resolved conflict refs.

execute_list

Display conflicts.

list_conflicts

List all active (unresolved) conflict records.

record_conflicts

Record conflict metadata for all conflicted files in the index.

resolve_file

Mark a file as resolved. Optionally accept “ours” or “theirs”.