Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict

Jens Lehmann [off-list ref] writes:

I do think status does have something to report here. First its job is to
list all submodules, so currently unmerged submodules should show up too,
and then it tells the user something about the state of the submodule. So
I would propose to print a line for the submodule starting with a special
character that tells the user the submodule has a merge conflict. We
could e.g. use a '*' here (additionally to '-' for uninitialized and '+'
for those submodules where the HEAD differs from the commit recorded in
the superproject).

Thanks.

As everybody knows, you are a lot more deeply involved in this than I do,
so please take the discussion and implementation from here.  For example,
I don't know if '*' or 'U' is more intuitive, and I'd rather not have to
make such decisions ;-)