| /dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/ |
| H A D | merge_file.c | 55 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
57 if (given_opts) in merge_file_normalize_opts()
58 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
70 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
82 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
179 const git_merge_file_options *given_opts) in merge_file__binary() argument
185 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
187 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
210 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
215 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/cargo-c/cargo-c-0.9.6+cargo-0.58/cargo-crates/libgit2-sys-0.12.26+1.3.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| H A D | email.c | 201 const git_email_create_options *given_opts) in git_email__append_from_diff() argument
212 GIT_ERROR_CHECK_VERSION(given_opts, in git_email__append_from_diff()
216 if (given_opts) in git_email__append_from_diff()
217 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email__append_from_diff()
240 const git_email_create_options *given_opts) in git_email_create_from_diff() argument
249 given_opts); in git_email_create_from_diff()
257 const git_email_create_options *given_opts) in git_email_create_from_commit() argument
272 GIT_ERROR_CHECK_VERSION(given_opts, in git_email_create_from_commit()
276 if (given_opts) in git_email_create_from_commit()
277 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email_create_from_commit()
|
| /dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/ |
| H A D | merge_file.c | 55 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
57 if (given_opts) in merge_file_normalize_opts()
58 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
70 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
82 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
179 const git_merge_file_options *given_opts) in merge_file__binary() argument
185 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
187 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
210 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
215 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/src/ |
| H A D | merge_file.c | 55 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
57 if (given_opts) in merge_file_normalize_opts()
58 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
70 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
82 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
179 const git_merge_file_options *given_opts) in merge_file__binary() argument
185 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
187 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
210 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
215 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| H A D | email.c | 201 const git_email_create_options *given_opts) in git_email__append_from_diff() argument
212 GIT_ERROR_CHECK_VERSION(given_opts, in git_email__append_from_diff()
216 if (given_opts) in git_email__append_from_diff()
217 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email__append_from_diff()
240 const git_email_create_options *given_opts) in git_email_create_from_diff() argument
249 given_opts); in git_email_create_from_diff()
257 const git_email_create_options *given_opts) in git_email_create_from_commit() argument
272 GIT_ERROR_CHECK_VERSION(given_opts, in git_email_create_from_commit()
276 if (given_opts) in git_email_create_from_commit()
277 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email_create_from_commit()
|
| /dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/ |
| H A D | merge_file.c | 55 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
57 if (given_opts) in merge_file_normalize_opts()
58 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
70 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
82 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
179 const git_merge_file_options *given_opts) in merge_file__binary() argument
185 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
187 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
210 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
215 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.19+1.1.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/ |
| H A D | merge_file.c | 55 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
57 if (given_opts) in merge_file_normalize_opts()
58 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
70 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
82 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
179 const git_merge_file_options *given_opts) in merge_file__binary() argument
185 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
187 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
210 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
215 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/ |
| H A D | merge_file.c | 55 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
57 if (given_opts) in merge_file_normalize_opts()
58 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
70 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
82 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
179 const git_merge_file_options *given_opts) in merge_file__binary() argument
185 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
187 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
210 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
215 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| H A D | email.c | 201 const git_email_create_options *given_opts) in git_email__append_from_diff() argument
212 GIT_ERROR_CHECK_VERSION(given_opts, in git_email__append_from_diff()
216 if (given_opts) in git_email__append_from_diff()
217 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email__append_from_diff()
240 const git_email_create_options *given_opts) in git_email_create_from_diff() argument
249 given_opts); in git_email_create_from_diff()
257 const git_email_create_options *given_opts) in git_email_create_from_commit() argument
272 GIT_ERROR_CHECK_VERSION(given_opts, in git_email_create_from_commit()
276 if (given_opts) in git_email_create_from_commit()
277 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email_create_from_commit()
|
| /dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| H A D | email.c | 201 const git_email_create_options *given_opts) in git_email__append_from_diff() argument
212 GIT_ERROR_CHECK_VERSION(given_opts, in git_email__append_from_diff()
216 if (given_opts) in git_email__append_from_diff()
217 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email__append_from_diff()
240 const git_email_create_options *given_opts) in git_email_create_from_diff() argument
249 given_opts); in git_email_create_from_diff()
257 const git_email_create_options *given_opts) in git_email_create_from_commit() argument
272 GIT_ERROR_CHECK_VERSION(given_opts, in git_email_create_from_commit()
276 if (given_opts) in git_email_create_from_commit()
277 memcpy(&opts, given_opts, sizeof(git_email_create_options)); in git_email_create_from_commit()
|
| /dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts)
60 if (given_opts)
61 memcpy(out, given_opts, sizeof(git_merge_file_options));
73 const git_merge_file_options *given_opts)
85 merge_file_normalize_opts(&options, given_opts);
182 const git_merge_file_options *given_opts)
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS)
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS)
213 const git_merge_file_options *given_opts)
218 return merge_file__binary(out, ours, theirs, given_opts);
[all …]
|
| /dports/devel/libgit2/libgit2-1.3.0/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|
| /dports/devel/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/ |
| H A D | merge_file.c | 58 const git_merge_file_options *given_opts) in merge_file_normalize_opts() argument
60 if (given_opts) in merge_file_normalize_opts()
61 memcpy(out, given_opts, sizeof(git_merge_file_options)); in merge_file_normalize_opts()
73 const git_merge_file_options *given_opts) in merge_file__xdiff() argument
85 merge_file_normalize_opts(&options, given_opts); in merge_file__xdiff()
182 const git_merge_file_options *given_opts) in merge_file__binary() argument
188 if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) in merge_file__binary()
190 else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) in merge_file__binary()
213 const git_merge_file_options *given_opts) in merge_file__from_inputs() argument
218 return merge_file__binary(out, ours, theirs, given_opts); in merge_file__from_inputs()
[all …]
|