diff: make struct diff_flags members lowercase

diff --git a/merge-recursive.c b/merge-recursive.c
index 9752aba4ed195e6c93e83b6ba05d020e580e6854..f6c03770b8c38c4d209bafc7fddafad30dd1d8a6 100644 (file)
--- 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 :