mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 09:26:10 +02:00
Code

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:
David Pursehouse 2018-03-17 12:31:42 +09:00 committed by Junio C Hamano
parent c25d98b2a7
commit bd9958c358
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