development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dp/merge-strategy-doc-fix'

Browse source 
Doc fix.

* dp/merge-strategy-doc-fix:
  Documentation/merge-strategies: typofix
This commit is contained in:
Junio C Hamano 2018-03-21 11:30:13 -07:00
parent bfaab4885a bd9958c358
commit e2a37ec2b0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/merge-strategies.txt
View file

@ -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