Re: Opinions on changing add/add conflict resolution?
From: Junio C Hamano <hidden>
Date: 2018-03-13 23:30:41
On Tue, Mar 13, 2018 at 4:14 PM, Elijah Newren [off-list ref] wrote:
Someone in the future might hate us if they use conflictstyle=diff3, and have a recursive merge,
FWIW I already always use diff3 style and see the nested markers, and I already hate it, so you are no worse off ;-)