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

Doc fix. * dp/merge-strategy-doc-fix: Documentation/merge-strategies: typofix
7 years ago · e2a37ec2b0
1 changed files with 1 additions and 1 deletions
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
				@@ -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