[PATCH 1/1] Fix typo in merge-strategies documentation
From: David Pursehouse <dpursehouse@collab.net>
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
---
Documentation/merge-strategies.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index fd5d748d1..4a58aad4b 100644
--- 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
--
2.16.2
David Pursehouse <david.pursehouse@gmail.com>