merge-strategies.txt: fix simple capitalization error

newren · gitster · commit b36ade216c4a · 2021-08-05T08:57:40.000-07:00
Acked-by: Derrick Stolee &lt;dstolee@microsoft.com&gt;
Acked-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Elijah Newren &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
@@ -529,7 +529,7 @@ The `--rebase-merges` mode is similar in spirit to the deprecated
 where commits can be reordered, inserted and dropped at will.
 +
 It is currently only possible to recreate the merge commits using the
-`recursive` merge strategy; Different merge strategies can be used only via
+`recursive` merge strategy; different merge strategies can be used only via
 explicit `exec git merge -s <strategy> [...]` commands.
 +
 See also REBASING MERGES and INCOMPATIBLE OPTIONS below.

Original file line number	Diff line number	Diff line change
@@ -529,7 +529,7 @@ The `--rebase-merges` mode is similar in spirit to the deprecated
`529`	`529`	`where commits can be reordered, inserted and dropped at will.`
`530`	`530`	`+`
`531`	`531`	`It is currently only possible to recreate the merge commits using the`
`532`		-`recursive` merge strategy; Different merge strategies can be used only via
	`532`	+`recursive` merge strategy; different merge strategies can be used only via
`533`	`533`	explicit `exec git merge -s <strategy> [...]` commands.
`534`	`534`	`+`
`535`	`535`	`See also REBASING MERGES and INCOMPATIBLE OPTIONS below.`