Re: [PATCH v2] builtin/merge_recursive.c: Add an usage string and make use of it.

On Sun, Aug 29, 2010 at 11:42 PM, Jonathan Nieder [off-list ref] wrote:

Now that you've researched it, wouldn't it make sense to include an
explanation for this %s in the log message?

Sure, added an the explanation of %s in the usage string and the example too.

Still, ack on this part.

Thanks.

quoted

@@ -37,19 +40,19 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)

              if (!prefixcmp(arg, "--")) {
                      if (!arg[2])
                              break;
-                     if (!strcmp(arg+2, "ours"))
+                     if (!strcmp(arg + 2, "ours"))

My comment on the rest still applies: it is best if patches do not
contain unrelated changes to unrelated parts of the files they touch.

Reverted these style fixes in patchset v3.