Don't allow conflicts by default

994404b5 · Edward Thomson · 091165c5 · 994404b5
Commit 994404b5 authored Jul 17, 2014 by Edward Thomson
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 2 deletions

src/merge.c
+1 -2

No files found.
--- 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));
 	}