Merge pull request libgit2#2477 from ethomson/merge

Vicent Marti · Vicent Marti · commit 9de6ec52008e · 2014-07-23T09:41:52.000+02:00
Don't allow conflicts by default
diff --git 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));
 	}

Original file line number	Diff line number	Diff line change
`@@ -2193,8 +2193,7 @@ static int merge_normalize_checkout_opts(`
`2193`	`2193`	`memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options));`
`2194`	`2194`	`else {`
`2195`	`2195`	`git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;`
`2196`		`- default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE \|`
`2197`		`- GIT_CHECKOUT_ALLOW_CONFLICTS;`
	`2196`	`+ default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;`
`2198`	`2197`
`2199`	`2198`	`memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options));`
`2200`	`2199`	`}`