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>
David Pursehouse committed
Mar 17, 2018 at 12:31 UTC
bd9958c35883e2199ceef21b34d9b26783d30cba
1 file changed
+1
-1
Documentation/merge-strategies.txt
+1
-1
@@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
40
41
theirs;;
42
This is the opposite of 'ours'; note that, unlike 'ours', there is
43
- no 'theirs' merge stragegy to confuse this merge option with.
43
+ no 'theirs' merge strategy to confuse this merge option with.
44
45
patience;;
46
With this option, 'merge-recursive' spends a little extra time