Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index c3c976d471ce78268e673a5135a4c37ebc6d0f6d..13afa47b14a3b581e43b7751803fb9b96d199fee 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-897,7
+897,7
@@
static int suggest_conflicts(void)
filename = git_path_merge_msg(the_repository);
fp = xfopen(filename, "a");
- append_conflicts_hint(&msgbuf);
+ append_conflicts_hint(&
the_index, &
msgbuf);
fputs(msgbuf.buf, fp);
strbuf_release(&msgbuf);
fclose(fp);