mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'dp/merge-strategy-doc-fix'
Doc fix. * dp/merge-strategy-doc-fix: Documentation/merge-strategies: typofix
This commit is contained in:
commit
e2a37ec2b0
|
@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
|
|||
|
||||
theirs;;
|
||||
This is the opposite of 'ours'; note that, unlike 'ours', there is
|
||||
no 'theirs' merge stragegy to confuse this merge option with.
|
||||
no 'theirs' merge strategy to confuse this merge option with.
|
||||
|
||||
patience;;
|
||||
With this option, 'merge-recursive' spends a little extra time
|
||||
|
|
Loading…
Reference in a new issue