Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ds/include-exclude'
[gitweb.git]
/
merge.c
diff --git
a/merge.c
b/merge.c
index dbbc9d9f802fef2781b9b60b798700f49229f84f..7c1d756c3fad6f9570b31c2c36f96e9f90df39f4 100644
(file)
--- a/
merge.c
+++ b/
merge.c
@@
-37,7
+37,7
@@
int try_merge_command(struct repository *r,
argv_array_clear(&args);
discard_index(r->index);
- if (re
ad_index(r->index
) < 0)
+ if (re
po_read_index(r
) < 0)
die(_("failed to read the cache"));
resolve_undo_clear_index(r->index);