On Tue, Jan 05, 2021 at 09:55:26PM -0800, Junio C Hamano wrote: > If the user explicitly says "I want the new behaviour enabled for > this particular merge tool", we are better off letting the user use > it and take responsibility for the possible breakage. Good suggestion. Agreed on all counts. I'll roll that preference hierarchy into the v10 patch set.
