diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-03-21 11:30:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-21 11:30:13 -0700 |
| commit | e2a37ec2b03456bc9131f7c1fe68e1742bf28953 (patch) | |
| tree | a00d3159adc01957ede0704f2d27138ce72b04be /Documentation | |
| parent | Merge branch 'tz/relnotes-1.7-on-perl' (diff) | |
| parent | Documentation/merge-strategies: typofix (diff) | |
| download | tgif-e2a37ec2b03456bc9131f7c1fe68e1742bf28953.tar.xz | |
Merge branch 'dp/merge-strategy-doc-fix'
Doc fix.
* dp/merge-strategy-doc-fix:
Documentation/merge-strategies: typofix
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-strategies.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index fd5d748d1b..4a58aad4b8 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 |