On Thu, Jul 22, 2010 at 06:51:32AM -0700, Carlo Marcelo Arenas Belon wrote:
> strbuf_addstr(&helpbuf, " After resolving the conflicts,\n"
> - "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
> - "and commit the result");
> + "mark the corrected paths with 'git add <paths>' or 'git rm <paths>'");
> + if (!no_commit) {
> + strbuf_addf(&helpbuf, "\nand commit the result");
Shouldn't we use strbuf_addstr here? We aren't using the formatting
part of strbuf_addf.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html