bisect: refactor sha1_array into a generic sha1 list

diff --git a/merge-recursive.c b/merge-recursive.c
index af131508ec7ffa3ac7b1b1b1cadfcda0040becf2..dba27643bd30768270d5c33753d6b26dea65face 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1711,15 +1711,15 @@ int merge_recursive_generic(struct merge_options *o,
 static int merge_recursive_config(const char *var, const char *value, void *cb)
 {
        struct merge_options *o = cb;
-       if (!strcasecmp(var, "merge.verbosity")) {
+       if (!strcmp(var, "merge.verbosity")) {
                o->verbosity = git_config_int(var, value);
                return 0;
        }
-       if (!strcasecmp(var, "diff.renamelimit")) {
+       if (!strcmp(var, "diff.renamelimit")) {
                o->diff_rename_limit = git_config_int(var, value);
                return 0;
        }
-       if (!strcasecmp(var, "merge.renamelimit")) {
+       if (!strcmp(var, "merge.renamelimit")) {
                o->merge_rename_limit = git_config_int(var, value);
                return 0;
        }