Andrew's git / gitweb.git / diff
?
Documentation/merge-strategies: typofix
authorDavid Pursehouse <dpursehouse@collab.net>
Sat, 17 Mar 2018 03:31:42 +0000 (12:31 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Mar 2018 16:47:56 +0000 (09:47 -0700)
It's strategy, not stragegy.

Signed-off-by: David Pursehouse <dpursehouse@collab.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.txt patch | blob | history
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index a09d5974639fa772ba86c5547fe70716fd044f73..e71c0cb82560eda66a12389281408751094625a4 100644 (file)
--- 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.
 
 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