From: Ramsay Jones <ramsay@ramsayjones.plus.com>
Date: Wed, 05 Jan 2022 19:09:18 GMT
Subject: Re: [PATCH v2 8/8] merge-tree: provide an easy way to access which files have conflicts
Message-ID: <ed528125-a2bb-9445-80c5-8c2994ef0d56@ramsayjones.plus.com>
In-Reply-To: <01364bb020ee2836016ec0e8eafa2261fb7800ab.1641403655.git.gitgitgadget@gmail.com>



On 05/01/2022 17:27, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> 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/

ATB,
Ramsay Jones