diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-07-18 13:40:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 13:40:32 -0700 |
commit | 9766dd37e7d543874fe13ac730c68c032bf5b0e2 (patch) | |
tree | 844bd84b77950b2110822be95905887d14b5124f /git.html | |
parent | ae2d874a965f920cc39147e22ad02afcf9c6be1b (diff) | |
download | git-htmldocs-9766dd37e7d543874fe13ac730c68c032bf5b0e2.tar.gz |
Autogenerated HTML docs for v2.37.1-188-g71a8f
Diffstat (limited to 'git.html')
-rw-r--r-- | git.html | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1606,7 +1606,7 @@ ancillary user utilities.</p></div> </dt>
<dd>
<p>
- Show three-way merge without touching index.
+ Perform merge without touching index or working tree.
</p>
</dd>
<dt class="hdlist1">
|