"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> @@ -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.
