X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-checkout.c;h=67229fc21607ceb51c34d77c4ef5682d96f1e909;hb=341d9a48cc4a6993f952c5c13417ba88227ef427;hp=2708669383e21f038a1404e061b34bc4302e8a93;hpb=3325cea0f7ef7355f6806b2fc88acdb2e27785ac;p=git.git

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 270866938..67229fc21 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -167,7 +167,7 @@ static int checkout_merged(int pos, struct checkout *state)
 	fill_mm(active_cache[pos+2]->sha1, &theirs);
 
 	status = ll_merge(&result_buf, path, &ancestor,
-			  &ours, "ours", &theirs, "theirs", 1);
+			  &ours, "ours", &theirs, "theirs", 0);
 	free(ancestor.ptr);
 	free(ours.ptr);
 	free(theirs.ptr);