From: Elijah Newren <newren@gmail.com>
Date: Sat, 29 Jan 2022 04:55:13 GMT
Subject: Re: [PATCH 08/12] merge-ort: provide a merge_get_conflicted_files() helper function
Message-ID: <CABPp-BFPDLQ8SQ3QhM+KPpkyKatckroBrGQJugpZ+z5CUwD_JA@mail.gmail.com>
In-Reply-To: <CAP8UFD0+ui2uJtyNSQ3Cq4k+9SPpjT08=CBhMFNJ0ni2tLQQPw@mail.gmail.com>

On Wed, Jan 26, 2022 at 2:55 AM Christian Couder
<christian.couder@gmail.com> wrote:
>
> On Sat, Jan 22, 2022 at 10:56 PM Elijah Newren via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>
> > After a merge, this function allows the user to extract the same
> > information that would be printed by `ls-files -u` -- conflicted
>
> This made me wonder if "-- conflicted" should be part of the `ls-files
> -u` command. Maybe "by `ls-files -u`, which means" would make things a
> bit clearer.
>
> > files with their mode, oid, and stage.

Yes, I like that wording better.  Thanks!