diff options
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-diff.html b/git-diff.html index 34f703e50..e585ddaf9 100644 --- a/git-diff.html +++ b/git-diff.html @@ -877,7 +877,7 @@ of <commit> and HEAD. <code>git diff --merge-base A</code> is equivalent noted that all of the <commit> in the above description, except
in the <code>--merge-base</code> case and in the last two forms that use <code>..</code>
notations, can be any <tree>. A tree of interest is the one pointed to
-by the special ref <code>AUTO_MERGE</code>, which is written by the <em>ort</em> merge
+by the ref named <code>AUTO_MERGE</code>, which is written by the <em>ort</em> merge
strategy upon hitting merge conflicts (see <a href="git-merge.html">git-merge(1)</a>).
Comparing the working tree with <code>AUTO_MERGE</code> shows changes you’ve made
so far to resolve textual conflicts (see the examples below).</p></div>
@@ -3679,7 +3679,7 @@ diff.colorMovedWS <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-23 13:24:09 PDT
+ 2023-12-27 15:50:18 PST
</div>
</div>
</body>
|