From: Junio C Hamano Date: Sun, 28 Aug 2005 05:45:05 GMT Subject: Re: Comments in read-tree about #nALT Message-ID: <7virxqpqce.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Daniel Barkalow 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.