diff options
| author | Vicent Marti <vicent@github.com> | 2014-07-23 09:41:52 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-07-23 09:41:52 +0200 |
| commit | 9de6ec52008e3f30a4e8a5c6a13859eefcf86f57 (patch) | |
| tree | 62d6be7b45f3ce7363f2802b5c3ff35e8ec0ca31 | |
| parent | 243db06ce3ab5ac984e24867815add6251819561 (diff) | |
| parent | 994404b5067f9cc35dfae2c460e209f30467c3b5 (diff) | |
| download | libgit2-9de6ec52008e3f30a4e8a5c6a13859eefcf86f57.tar.gz | |
Merge pull request #2477 from ethomson/merge
Don't allow conflicts by default
| -rw-r--r-- | src/merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index f8d008a6d..668ac2cd2 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2193,8 +2193,7 @@ static int merge_normalize_checkout_opts( memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options)); else { git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_ALLOW_CONFLICTS; + default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options)); } |