[PATCH] merge-strategies: Fix typo "reflected to"
- From
- Dominic Jäger <dominic.jaeger@gmail.com>
- Date
- Nov 8, 2019, 14:47 UTC
- Message-ID
- <CAFOfB_LMQBOFK5PzhezcMGshmETY0agVK_iRW7vEayR9=Oyaow@mail.gmail.com>
reflected to" does not exist (according to https://dictionary.cambridge.org/dictionary/english/reflect?q=reflected and https://www.merriam-webster.com/dictionary/reflected)
Signed-off-by: Dominic Jäger <dominic.jaeger@gmail.com> --- I only took a quick glance at the submitting patch guidelines. Feel free to quickly push this yourself if you want. Also, I'm not native, so I hope I looked this up correctly.
Documentation/merge-strategies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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 -- 2.17.1