Re: [PATCH] docs: correct mistakes in git-merge

>> Additionally diagrams on the page are adjusted
>> to use spaces instead of tabs, so that they align
>> regardless of tab size. This is in line with
>> diagrams on other git documentation pages.
>
> To be precise, you could add to the commit message that the faulty
> description was introduced in 0c514d576685 (git-merge.txt: mention
> 'ORIG_HEAD' in the Description, 2023-01-10). (I Cc:ed Philippe Blain who
> authored that patch.)
> ...
>>  ------------
>> -	  A---B---C topic
>> -	 /
>> +          A---B---C topic
>> +         /
>
> ... while correcting the description seemed fairly straight-forward, this
> white-space change appears to tread on more delicate territory. It might
> deserve its own patch
> ...
>> @@ -38,11 +38,11 @@ Then `git merge topic` will replay the changes made on the
>>  its current commit (`C`) on top of `master`, and record the result
>>  in a new commit along with the names of the two parent commits and
>>  a log message from the user describing the changes. Before the operation,
>> -`ORIG_HEAD` is set to the tip of the current branch (`C`).
>> +`ORIG_HEAD` is set to the tip of the current branch (`G`).
>
> This is obviously a good fix.