diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 15:34:39 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 15:34:39 +0900 |
| commit | f088858b7d9cf7778d88910914cf7c34d0fdeb83 (patch) | |
| tree | 9218886e61e3784e2ef626190f39003136bb75ad /git-merge.html | |
| parent | 20c484eb042459f279c89d562aaf9d77dc2f7862 (diff) | |
| download | git-htmldocs-f088858b7d9cf7778d88910914cf7c34d0fdeb83.tar.gz | |
Autogenerated HTML docs for v2.14.2-642-g20fed
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index 1cc524446..b6b967e9f 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1441,7 +1441,8 @@ theirs </dt>
<dd>
<p>
- This is the opposite of <em>ours</em>.
+ 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.
</p>
</dd>
<dt class="hdlist1">
|