Hi Elijah, On Fri, 28 Jan 2022, Elijah Newren wrote: > On Fri, Jan 28, 2022 at 8:57 AM Johannes Schindelin > <Johannes.Schindelin@xxxxxx> wrote: > > > > Hi Elijah, > > > > On Sat, 22 Jan 2022, Elijah Newren via GitGitGadget wrote: > > > > > From: Elijah Newren <newren@xxxxxxxxx> > > > > [...] > > > diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt > > > index fd7a867de60..041a4ac2785 100644 > > > --- a/Documentation/git-merge-tree.txt > > > +++ b/Documentation/git-merge-tree.txt > > > @@ -58,6 +58,7 @@ simply one line: > > > Whereas for a conflicted merge, the output is by default of the form: > > > > > > <OID of toplevel tree> > > > + <Conflicted file list> > > > <Informational messages> > > > > To distinguish between the list of conflicted files and the informational > > messages, I think it would be good to insert an empty line, as a > > separator, like. > > Yes, I agree; that's why I did so. :-) My concern was that I did not see this empty line reflected in the quoted diff. I would have expected an empty line between the `<Conflicted [...]>` and the `<Informational [...]>` line. Thanks, Dscho
