merge: add merge.renames config setting

diff --git a/run-command.c b/run-command.c
index a483d5904a3ec1acae8908dd2e699fa00bcaaa9d..84899e423f098bb8cd61eee86bcc484139b1482f 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -621,7 +621,7 @@ static void trace_run_command(const struct child_process *cp)
        if (!trace_want(&trace_default_key))
                return;
 
-       strbuf_addf(&buf, "trace: run_command:");
+       strbuf_addstr(&buf, "trace: run_command:");
        if (cp->dir) {
                strbuf_addstr(&buf, " cd ");
                sq_quote_buf_pretty(&buf, cp->dir);