From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2008 20:48:09 GMT
Subject: Re: Move-delete merge conflict is not displayed using git ls-files --unmerged
Message-ID: <7v4p0whr7a.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <85647ef50812220629o46134a70waf159bb6cd6d6e72@mail.gmail.com>

"Constantine Plotnikov" <constantine.plotnikov@gmail.com> writes:

> I think that if git merge reports the conflicts, such conflicts should
> be discoverable using git ls-files and prevent commit with resolving
> the conflict like it is done with modify-delete conflicts.

Yeah, I think so, too.