diff --git a/merge-recursive.c b/merge-recursive.c
index 4a5c77c3b632a9c0636848b933ef5395b01b7103..9a1e2f269dc5eff3b7544507a1e483948cc1254d 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
renames = xcalloc(1, sizeof(struct path_list));
diff_setup(&opts);
- opts.recursive = 1;
+ DIFF_OPT_SET(&opts, RECURSIVE);
opts.detect_rename = DIFF_DETECT_RENAME;
opts.rename_limit = rename_limit;
opts.output_format = DIFF_FORMAT_NO_OUTPUT;
{
struct commit_list *iter;
struct commit *merged_common_ancestors;
- struct tree *mrtree;
+ struct tree *mrtree = mrtree;
int clean;
if (show(4)) {