From: Elijah Newren via GitGitGadget Date: Wed, 04 Aug 2021 05:28:49 GMT Subject: [PATCH v2 04/10] merge-strategies.txt: update wording for the resolve strategy Message-ID: In-Reply-To: From: Elijah Newren It is probably helpful to cover the default merge strategy first, so move the text for the resolve strategy to later in the document. Further, the wording for "resolve" claimed that it was "considered generally safe and fast", which might imply in some readers minds that the same is not true of other strategies. Rather than adding this text to all the strategies, just remove it from this one. Signed-off-by: Elijah Newren --- Documentation/merge-strategies.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 5d707e952aa..f100fad1e43 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -6,13 +6,6 @@ backend 'merge strategies' to be chosen with `-s` option. Some strategies can also take their own options, which can be passed by giving `-X