proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-21 23:04:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't allow conflicts by default

Browse Source
This commit is contained in:
Edward Thomson 2014-07-17 01:25:31 -04:00
parent 091165c53b
commit 994404b506
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/merge.c
View File

@ -2193,8 +2193,7 @@ static int merge_normalize_checkout_opts(
memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options)); memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options));
else { else {
git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
GIT_CHECKOUT_ALLOW_CONFLICTS;
memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options)); memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options));
} }