diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-27 15:51:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-27 15:51:52 -0800 |
| commit | 7ae46b40202f2928d34d523c62e7c215f44f91bf (patch) | |
| tree | ffb22c4c699c9a6be3281ddd35ee32753d75141a /git-diff.txt | |
| parent | 8c556f838df5e9e4fbfe52d9ad098610973b13bf (diff) | |
| download | git-htmldocs-7ae46b40202f2928d34d523c62e7c215f44f91bf.tar.gz | |
Autogenerated HTML docs for v2.43.0-232-ge7955
Diffstat (limited to 'git-diff.txt')
| -rw-r--r-- | git-diff.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-diff.txt b/git-diff.txt index 08087ffad..c065f023e 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -103,7 +103,7 @@ Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>. A tree of interest is the one pointed to -by the special ref `AUTO_MERGE`, which is written by the 'ort' merge +by the ref named `AUTO_MERGE`, which is written by the 'ort' merge strategy upon hitting merge conflicts (see linkgit:git-merge[1]). Comparing the working tree with `AUTO_MERGE` shows changes you've made so far to resolve textual conflicts (see the examples below). |