Re: Comments in read-tree about #nALT
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:05
Daniel Barkalow [off-list ref] writes:
What I missed was that the effect of causes_df_conflict is to give "no merge" for the entry, rather than giving an error overall. So I do need an equivalent.
Correct.