diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-12-28 10:41:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-15 15:38:29 -0800 |
| commit | 0aa9d8aa6ce429f0fa04e1ca819ed766c211e242 (patch) | |
| tree | a1300182f22bf55f45b5769673cabc6535666dd7 /builtin/merge.c | |
| parent | Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth (diff) | |
| parent | rebase-interactive.c: remove the_repository references (diff) | |
| download | git-0aa9d8aa6ce429f0fa04e1ca819ed766c211e242.tar.gz git-0aa9d8aa6ce429f0fa04e1ca819ed766c211e242.zip | |
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index c3c976d471..13afa47b14 100644 --- 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); |