Structs§
- Merge
Result - Result of a merge operation
Enums§
- File
Status - Status of a file in three-way comparison (cache vs current vs new)
- Merge
Strategy - Strategy for handling merge conflicts
Functions§
- merge_
generated_ code - Perform three-way merge: staging vs output vs cache
- print_
merge_ summary - Print merge result summary with warnings for conflicts