rerere: write out each record of MERGE_RR in one go

diff --git a/builtin/config.c b/builtin/config.c
index 15a7bea936d667042cef27f83c86a863df2caa8f..73dc2f1024ad986a2421b0c6e9c5845574437d41 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -455,9 +455,9 @@ static char *default_user_config(void)
        struct strbuf buf = STRBUF_INIT;
        strbuf_addf(&buf,
                    _("# This is Git's per-user configuration file.\n"
-                     "[core]\n"
+                     "[user]\n"
                      "# Please adapt and uncomment the following lines:\n"
-                     "#        user = %s\n"
+                     "#        name = %s\n"
                      "#        email = %s\n"),
                    ident_default_name(),
                    ident_default_email());