diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:36 -0800 |
| commit | a774064fb03d58ecb757507e15a6959bc856343d (patch) | |
| tree | 1d1c1ff174e75ccf8c90b6227e23a687c457c9a8 /Documentation | |
| parent | Merge branch 'rj/bundle-ui-updates' (diff) | |
| parent | merge-strategies: fix typo "reflected to" to "reflected in" (diff) | |
| download | tgif-a774064fb03d58ecb757507e15a6959bc856343d.tar.xz | |
Merge branch 'dj/typofix-merge-strat'
Typofix.
* dj/typofix-merge-strat:
merge-strategies: fix typo "reflected to" to "reflected in"
Diffstat (limited to 'Documentation')
| -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 |