diff options
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 9752aba4ed..f6c03770b8 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -540,8 +540,8 @@ static struct string_list *get_renames(struct merge_options *o, return renames; diff_setup(&opts); - opts.flags.RECURSIVE = 1; - opts.flags.RENAME_EMPTY = 0; + opts.flags.recursive = 1; + opts.flags.rename_empty = 0; opts.detect_rename = DIFF_DETECT_RENAME; opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : o->diff_rename_limit >= 0 ? o->diff_rename_limit : |