From: Junio C Hamano Date: Fri, 23 Oct 2026 16:00:23 GMT Subject: Re: [PATCH v4 0/6] [doc] Add new page on merge conflicts Message-ID: In-Reply-To: "Julia Evans via GitGitGadget" writes: > @@ Documentation/gitmergeconflicts.adoc (new) > + "cherry", > + "mango", > +||||||| 1c22e48 > ++ "banana", > ++ "cherry", > + "mangoooo", > +======= Is it intended to use different indentation style for the entries to be removed from the list, or is it a simple mistake? > + "banana", > @@ Documentation/gitmergeconflicts.adoc (new) > +] > +---- > + > ++With this view, you can see that both sides fixed a spelling > ++mistake in "mango", and each removed one fruit to the list. "removed one fruit *from* the list", no? I'll block time to read the whole thing over later today. Thanks.