From: Peter Kästle <peter@piie.net>
Date: Sun, 02 Feb 2020 23:16:38 GMT
Subject: Re: Re: [PATCH v2] Fix status of initialized but not cloned submodules
Message-ID: <0a541856-09c4-4549-713f-3d65b685129d@piie.net>
In-Reply-To: <xmqqblqs3hbv.fsf@gitster-ct.c.googlers.com>

On 24.01.20 18:16, Junio C Hamano wrote:
> Peter Kästle <peter.kaestle@nokia.com> writes:
>> Besides that, I think testcases for man git-submodule's description of
>> status on merge conflicts are missing (...[prefix] U if the submodule
>> has merge conflicts).
> 
> Nice to know.  Thanks.

I was wrong.  Testcases for "submodule status" to add prefix U in case 
of submodules with merge conflicts do exist in: t7405-submodule-merge.sh
The two tests are called:
git submodule status should display the merge conflict properly with[..]

-- 
--peter;