From: Elijah Newren Date: Wed, 05 Jan 2022 19:17:38 GMT Subject: Re: [PATCH v2 8/8] merge-tree: provide an easy way to access which files have conflicts Message-ID: In-Reply-To: On Wed, Jan 5, 2022 at 11:09 AM Ramsay Jones wrote: > > On 05/01/2022 17:27, Elijah Newren via GitGitGadget wrote: > > From: Elijah Newren > > > > Callers of `git merge-tree --real` might want an easy way to determine > > which files conflicted. While they could potentially use the --messages > > option and parse the resulting messages written to that file, those > > messages are not meant to be machine readable. Provide a simpler > > mechanism of having the user specify --unmerged-list=$FILENAME, and then > > s/unmerged-list/conflicted-list/ Indeed. I had noticed after v1 that I had a mixture of using both "unmerged" and "conflicted" to refer to the same thing, and tried to fix it by always using the latter term. Unfortunately, I missed updating this commit message. Thanks for pointing it out; will fix.