From bd9958c35883e2199ceef21b34d9b26783d30cba Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sat, 17 Mar 2018 12:31:42 +0900 Subject: Documentation/merge-strategies: typofix It's strategy, not stragegy. Signed-off-by: David Pursehouse Signed-off-by: Junio C Hamano --- 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 a09d597463..e71c0cb825 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 -- cgit v1.2.1