On Wed, Jan 26, 2022 at 2:55 AM Christian Couder
[off-list ref] wrote:

On Sat, Jan 22, 2022 at 10:56 PM Elijah Newren via GitGitGadget
[off-list ref] wrote:

quoted

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.

quoted

files with their mode, oid, and stage.

Yes, I like that wording better.  Thanks!