diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
commit | 8ef91f31f6606a0370b18943c3b0f089e04873f9 (patch) | |
tree | 2bf27a3779a34fa4bf69dfc02e1fe1be848ea0d2 /merge-strategies.txt | |
parent | 8ac8a3d8dd001611b77776fa19ef37c2c87cd987 (diff) | |
download | git-htmldocs-8ef91f31f6606a0370b18943c3b0f089e04873f9.tar.gz |
Autogenerated HTML docs for v2.24.0-308-g228f5
Diffstat (limited to 'merge-strategies.txt')
-rw-r--r-- | merge-strategies.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index aa66cbe41..2912de706 100644 --- a/merge-strategies.txt +++ b/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 |