diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-17 01:25:31 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-17 01:25:31 -0400 |
| commit | 994404b5067f9cc35dfae2c460e209f30467c3b5 (patch) | |
| tree | a3af89f04fcb49a5671bcb81eac331904cb94f14 | |
| parent | 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d (diff) | |
| download | libgit2-994404b5067f9cc35dfae2c460e209f30467c3b5.tar.gz | |
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)); } |