Daniel Barkalow <[EMAIL PROTECTED]> 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. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html