From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 29 Mar 2024 20:43:53 GMT
Subject: Re: Feature request: a merge strategy that makes any file difference a merge conflict
Message-ID: <CAAJCdQQceA7yANHCPzUGbANR-XKVDUzfN5ym6Rb-oEWgcq=4Uw@mail.gmail.com>
In-Reply-To: <xmqqfrw8ygg2.fsf@gitster.g>

Junio-

Thank you for the clarification.  There is a lot of misleading
information about this on the Internet.

I was mistaken about when a merge driver is called.  Now I see that
the merge driver is called anytime that no two of
{base,parent1,parent2} are the same.  This means that a merge driver
*can* prevent a clean-but-incorrect merge.  I was right that a
mergetool cannot be used to correct a clean-but-incorrect merge.

-Mike