X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=9a1e2f269dc5eff3b7544507a1e483948cc1254d;hb=2099bca9ed06a4cb7ab0b8ca38bc90df5632ba41;hp=6c6f595fbc7da09a41228e09cd2c5ef48b91f3f0;hpb=7ae4dd05725e1613375e03f206077959853d6b51;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 6c6f595fb..9a1e2f269 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -366,7 +366,7 @@ static struct path_list *get_renames(struct tree *tree,
 
 	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;