grep: add --threads=<num> option and grep.threads configuration

diff --git a/builtin/merge.c b/builtin/merge.c
index a0a93282922ebb8c58b79ff365d859500041351a..977ffff2876de4d817025bbf6d11ec251b674141 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -806,7 +806,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
                        abort_commit(remoteheads, NULL);
        }
        read_merge_msg(&msg);
-       stripspace(&msg, 0 < option_edit);
+       strbuf_stripspace(&msg, 0 < option_edit);
        if (!msg.len)
                abort_commit(remoteheads, _("Empty commit message."));
        strbuf_release(&merge_msg);