merge-strategies: fix typo "reflected to" to "reflected in"

[thirdparty/git.git] / Documentation / merge-strategies.txt

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index aa66cbe41eaf070a74d98801ba973daeb8d15106..2912de706bf3921f817c9d18c66e526fd0a0fa8e 100644 (file)
--- 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