From 994404b5067f9cc35dfae2c460e209f30467c3b5 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 17 Jul 2014 01:25:31 -0400 Subject: [PATCH] Don't allow conflicts by default --- src/merge.c | 3 +-- 1 file changed, 1 insertion(+), 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)); }