I'll do the s/octu/octo/; again on the title while queuing.
Let's merge this to 'next'.
Thanks.
On Tue, 9 Oct 2018 at 21:43, Junio C Hamano wrote:
> I had a bit hard time parsing the above, especially with "then",
> which probably would make it easier to read if it is not there.
Okay, I guess better to separate the explanation from the diagrams,
rather than weaving them together:
For
Noam Postavsky writes:
> For octopus merges where the first parent edge immediately merges into
> the next column to the left:
>
> | *-.
> | |\ \
> |/ / /
>
> then the number of columns should be one less than the usual case:
>
> | *-.
> | |\ \
> | | | *
I had a bit hard time parsing the above,
For octopus merges where the first parent edge immediately merges into
the next column to the left:
| *-.
| |\ \
|/ / /
then the number of columns should be one less than the usual case:
| *-.
| |\ \
| | | *
Also refactor the code to iterate over columns rather than dashes,
building from an
4 matches
Mail list logo
