diff options
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 20a28b218..a25951475 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -705,7 +705,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote opts.merge = 1; opts.fn = twoway_merge; opts.show_all_errors = 1; - setup_unpack_trees_porcelain(opts.msgs, "merge"); + setup_unpack_trees_porcelain(&opts, "merge"); trees[nr_trees] = parse_tree_indirect(head); if (!trees[nr_trees++]) |