On Sat, Jan 22, 2022 at 10:56 PM Elijah Newren via GitGitGadget <gitgitgadget@xxxxxxxxx> 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.
