diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-09-02 13:57:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:31:41 -0700 |
| commit | e294030fe89efcdd92430b60cf9568ffbe7317a8 (patch) | |
| tree | 574bbe6ed9e41ae61f130ba476f24da6b3847415 /merge-recursive.c | |
| parent | dc1166e685dc54946ea4600e962e56a965962ec2 (diff) | |
| download | git-e294030fe89efcdd92430b60cf9568ffbe7317a8.tar.gz | |
setup_unpack_trees_porcelain: take the whole options struct as parameter
This is a preparation patch to let setup_unpack_trees_porcelain set
show_all_errors itself.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 85f339ef7a..084f54b88c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -185,7 +185,7 @@ static int git_merge_trees(int index_only, opts.fn = threeway_merge; opts.src_index = &the_index; opts.dst_index = &the_index; - setup_unpack_trees_porcelain(opts.msgs, "merge"); + setup_unpack_trees_porcelain(&opts, "merge"); init_tree_desc_from_tree(t+0, common); init_tree_desc_from_tree(t+1, head); |