checkout --conflict=diff3: add a label for ancestor

diff --git a/builtin/checkout.c b/builtin/checkout.c
index d67f809a9ca150e9ca523013725044f3ef7ef8db..d652b4c95f9d6059998c1837dd661bb8194e2c56 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -149,7 +149,7 @@ static int checkout_merged(int pos, struct checkout *state)
        read_mmblob(&ours, active_cache[pos+1]->sha1);
        read_mmblob(&theirs, active_cache[pos+2]->sha1);
 
-       status = ll_merge(&result_buf, path, &ancestor, NULL,
+       status = ll_merge(&result_buf, path, &ancestor, "base",
                          &ours, "ours", &theirs, "theirs", 0);
        free(ancestor.ptr);
        free(ours.ptr);