diff options
| author | Dominic Jäger <dominic.jaeger@gmail.com> | 2019-11-08 15:47:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-11 11:04:46 +0900 |
| commit | 68d40f30c43cd0fa4721a340625f2f58c2525600 (patch) | |
| tree | 0b2bbf0c2776c42a1db6f8d828441e7c12cfed77 /Documentation/merge-strategies.txt | |
| parent | 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff) | |
| download | git-68d40f30c43cd0fa4721a340625f2f58c2525600.tar.gz | |
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>
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |