From: Dominic Jäger Date: Fri, 8 Nov 2019 14:47:01 +0000 (+0100) Subject: merge-strategies: fix typo "reflected to" to "reflected in" X-Git-Tag: v2.25.0-rc0~108^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68d40f30c43cd0fa4721a340625f2f58c2525600;p=thirdparty%2Fgit.git merge-strategies: fix typo "reflected to" to "reflected in" Signed-off-by: Dominic Jäger Signed-off-by: Junio C Hamano --- diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index aa66cbe41e..2912de706b 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options: ours;; This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version. Changes from the other tree that do not - conflict with our side are reflected to the merge result. + conflict with our side are reflected in the merge result. For a binary file, the entire contents are taken from our side. + This should not be confused with the 'ours' merge strategy, which does not