Hi Elijah, On Sat, 22 Jan 2022, Elijah Newren via GitGitGadget wrote: > +The second form is deprecated; it is kept for backward compatibility > +reasons but may be deleted in the future. It will only do a trivial > +merge. It reads three tree-ish, and outputs trivial merge results and > +conflicting stages to the standard output in a semi-diff format. > +Since this was designed for higher level scripts to consume and merge > +the results back into the index, it omits entries that match > +<branch1>. The result of this second form is is similar to what There is a double "is" in this line. Taking a step back, I would suggest to not only remove this paragraph, but to mark the `[--trivial-merge]` option clearly as `(DEPRECATED)`. > +three-way 'git read-tree -m' does, but instead of storing the results > +in the index, the command outputs the entries to the standard output. > +This form not only has limited applicability, the output format is > +also difficult to work with, and it will generally be less performant > +than the first form even on successful merges (especially if working > +in large repositories). The remainder of this manual will only > +discuss the first form. Thank you, Dscho
