t6021: add a new test for git-merge-resolve

diff --git a/builtin-merge.c b/builtin-merge.c
index b2e702a11fe0c1849caf0da508f9f2febecb5439..2ee16746908179960fcd57dc16d042d24f741833 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -464,6 +464,8 @@ int git_merge_config(const char *k, const char *v, void *cb)
                return git_config_string(&pull_twohead, k, v);
        else if (!strcmp(k, "pull.octopus"))
                return git_config_string(&pull_octopus, k, v);
+       else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary"))
+               option_log = git_config_bool(k, v);
        return git_diff_ui_config(k, v, cb);
 }