Re: [PATCH 01/10] merge-ort: handle D/F conflict where directory disappears due to merge

[Derrick Stolee <stolee@xxxxxxxxx>]

On 12/18/2020 12:51 AM, Elijah Newren via GitGitGadget wrote:
> +	} else if (ci->df_conflict && ci->merged.result.mode != 0) {
>  		die("Not yet implemented.");
>  	}
>  
>  	/*
>  	 * NOTE: Below there is a long switch-like if-elseif-elseif... block
>  	 *       which the code goes through even for the df_conflict cases
> -	 *       above.  Well, it will once we don't die-not-implemented above.
> +	 *       above.
>  	 */

This comment change might be a bit premature.

Thanks,
-Stolee