diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-21 12:54:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-21 12:54:50 -0700 |
| commit | 81000167654335ce6ae7c909bc563b73b5ad7c65 (patch) | |
| tree | b95620d74248d36b55ebd03809f948f7703b5c0c /git-pull.html | |
| parent | c756926d575a42433fb764a16b48327974208afb (diff) | |
| download | git-htmldocs-81000167654335ce6ae7c909bc563b73b5ad7c65.tar.gz | |
Autogenerated HTML docs for v2.17.0-rc1
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index e86f414ff..9b71a0535 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1674,7 +1674,7 @@ theirs <dd>
<p>
This is the opposite of <em>ours</em>; note that, unlike <em>ours</em>, there is
- no <em>theirs</em> merge stragegy to confuse this merge option with.
+ no <em>theirs</em> merge strategy to confuse this merge option with.
</p>
</dd>
<dt class="hdlist1">
|