Add function: git_merge_file_from_index#1062

Merged

ehuss merged 9 commits into

rust-lang:masterfrom

MikeJerred:master

Mar 17, 2025

Commits on Mar 17, 2025

feat(merge): add merge_file_from_index

MikeJerred
authored and
ehuss
committed
style: fix code formatting

MikeJerred
authored and
ehuss
committed
fix: review comments

MikeJerred
authored and
ehuss
committed
fix: use correct typings for git_merge_file_flag_t

MikeJerred
authored and
ehuss
committed
fix: mark to_raw as `unsafe`

MikeJerred
authored and
ehuss
committed
fix: type mismatch error

MikeJerred
authored and
ehuss
committed
Make MergeFileOptions::raw pub(crate)
ehuss
committed
Drop Copy/Clone from git_merge_file_result
ehuss
committed
Drop lifetime for MergeFileResult
ehuss
committed