Merge branch 'fc/remote-testgit-feature-done'

diff --git a/builtin/merge.c b/builtin/merge.c
index 3a31c4bc259a3169d815b9a3966675d9faab7ab7..9307e9c726587461d002530938dbf2c0d74d55a1 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1222,6 +1222,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                        memset(&opts, 0, sizeof(opts));
                        opts.add_title = !have_message;
                        opts.shortlog_len = shortlog_len;
+                       opts.credit_people = (0 < option_edit);
 
                        fmt_merge_msg(&merge_names, &merge_msg, &opts);
                        if (merge_msg.len)