Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-blobs.c: remove implicit dependency on the_index
[gitweb.git]
/
builtin
/
checkout.c
diff --git
a/builtin/checkout.c
b/builtin/checkout.c
index 29ef50013dccbd118093af0b4dc08eb907953cc2..cd9be501611b4522ab7bdc80f9328e88426f3dd5 100644
(file)
--- a/
builtin/checkout.c
+++ b/
builtin/checkout.c
@@
-208,7
+208,8
@@
static int checkout_merged(int pos, const struct checkout *state)
* merge.renormalize set, too
*/
status = ll_merge(&result_buf, path, &ancestor, "base",
- &ours, "ours", &theirs, "theirs", NULL);
+ &ours, "ours", &theirs, "theirs",
+ state->istate, NULL);
free(ancestor.ptr);
free(ours.ptr);
free(theirs.ptr);