From: Christian Couder <christian.couder@gmail.com>
Date: Wed, 26 Jan 2022 10:55:30 GMT
Subject: Re: [PATCH 08/12] merge-ort: provide a merge_get_conflicted_files() helper function
Message-ID: <CAP8UFD0+ui2uJtyNSQ3Cq4k+9SPpjT08=CBhMFNJ0ni2tLQQPw@mail.gmail.com>
In-Reply-To: <35e0ed9271a0229fe2acd2385a7e4171d4dfe077.1642888562.git.gitgitgadget@gmail.com>

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.