Add branch --set-upstream

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 793542eb062e7a17ac7bf9331c578ab4dff00aab..e44e238c39a7d4c276edf3bfe054b5929c009eda 100644 (file)
--- 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);