Re: [PATCH 03/10] Documentation: edit awkward references to `git merge-recursive`

On Tue, Aug 3, 2021 at 6:14 PM Junio C Hamano [off-list ref] wrote:

"Elijah Newren via GitGitGadget" [off-list ref] writes:

quoted

@@ -355,8 +355,8 @@ See also INCOMPATIBLE OPTIONS below.
 -s <strategy>::
 --strategy=<strategy>::
      Use the given merge strategy.
-     If there is no `-s` option 'git merge-recursive' is used
-     instead.  This implies --merge.
+     If there is no `-s` option the `recursive` strategy is the
+     default. This implies --merge.

We can depart from the original even more to make it shorter and
more readable, I think.

    Use the given merge strategy, instead of the default
    `recursive`.  This implies `--merge`.

But the above is readable enough already, so I'll queue it as-is.

I'm making multiple tweaks already for Eric and Dscho, so I'll include
this in the re-roll.