merge-strategies: fix typo "reflected to" to "reflected in"
Signed-off-by: Dominic Jäger <dominic.jaeger@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dominic Jäger committed
Nov 8, 2019 at 15:47 UTC
68d40f30c43cd0fa4721a340625f2f58c2525600
1 file changed
+1
-1
Documentation/merge-strategies.txt
+1
-1
@@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options:
32
ours;;
33
This option forces conflicting hunks to be auto-resolved cleanly by
34
favoring 'our' version. Changes from the other tree that do not
35
- conflict with our side are reflected to the merge result.
35
+ conflict with our side are reflected in the merge result.
36
For a binary file, the entire contents are taken from our side.
37
+
38
This should not be confused with the 'ours' merge strategy, which does not