diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:54:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:54:25 -0700 |
| commit | 7a031e5c8c444cac4c199ecf6538eb89f8862071 (patch) | |
| tree | bef184dc029d8342f45d83bace3deeedae0e6b7b /user-manual.txt | |
| parent | d2e30562620c9dda7b685f4d3bcb8acab537d97c (diff) | |
| download | git-htmldocs-7a031e5c8c444cac4c199ecf6538eb89f8862071.tar.gz | |
Autogenerated HTML docs for v2.33.0-113-g6c408
Diffstat (limited to 'user-manual.txt')
| -rw-r--r-- | user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user-manual.txt b/user-manual.txt index 96240598e..865074bed 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -3190,7 +3190,7 @@ that *updated* thing--the old state that you added originally ends up not being pointed to by any commit or tree, so it's now a dangling blob object. -Similarly, when the "recursive" merge strategy runs, and finds that +Similarly, when the "ort" merge strategy runs, and finds that there are criss-cross merges and thus more than one merge base (which is fairly unusual, but it does happen), it will generate one temporary midway tree (or possibly even more, if you had lots of criss-crossing |