mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Documentation/merge-strategies: typofix
It's strategy, not stragegy. Signed-off-by: David Pursehouse <dpursehouse@collab.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c25d98b2a7
commit
bd9958c358
|
@ -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