summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-21 18:30:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-21 18:30:13 (GMT)
commite2a37ec2b03456bc9131f7c1fe68e1742bf28953 (patch)
treea00d3159adc01957ede0704f2d27138ce72b04be /Documentation/merge-strategies.txt
parentbfaab4885ad235dd7612eff46923a881f0b4b21d (diff)
parentbd9958c35883e2199ceef21b34d9b26783d30cba (diff)
downloadgit-e2a37ec2b03456bc9131f7c1fe68e1742bf28953.zip
git-e2a37ec2b03456bc9131f7c1fe68e1742bf28953.tar.gz
git-e2a37ec2b03456bc9131f7c1fe68e1742bf28953.tar.bz2
Merge branch 'dp/merge-strategy-doc-fix'
Doc fix. * dp/merge-strategy-doc-fix: Documentation/merge-strategies: typofix
Diffstat (limited to 'Documentation/merge-strategies.txt')
-rw-r--r--Documentation/merge-strategies.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index fd5d748..4a58aad 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