git-2.22.0/rerere.c
/*
 * Try using the given conflict resolution "ID" to see
 * if that recorded conflict resolves cleanly what we
 * got in the "cur".
 */
Try using the given conflict resolution "ID" to see
if that recorded conflict resolves cleanly what we
got in the "cur".
Try using the given conflict resolution " ID " to see if that recorded conflict resolves cleanly what we got in the " cur " .
static int try_merge(struct index_state *istate,
		     const struct rerere_id *id, const char *path,
		     mmfile_t *cur, mmbuffer_t *result)
{
	int ret;
	mmfile_t base = {NULL, 0}, other = {NULL, 0};
	if (read_mmfile(&base, rerere_path(id, "preimage")) ||
	    read_mmfile(&other, rerere_path(id, "postimage")))
		ret = 1;
	else
		ret = ll_merge(result, path, &base, NULL, cur, "", &other, "",
			       istate, NULL);
	free(base.ptr);
	free(other.ptr);
	return ret;
}
static int try_merge ( struct index_state * istate , const struct rerere_id * id , const char * path , mmfile_t * cur , mmbuffer_t * result ) { int ret ; mmfile_t base = { NULL , 0 } , other = { NULL , 0 } ; if ( read_mmfile ( & base , rerere_path ( id , " " ) ) || read_mmfile ( & other , rerere_path ( id , " " ) ) ) ret = 1 ; else ret = ll_merge ( result , path , & base , NULL , cur , " " , & other , " " , istate , NULL ) ; free ( base . ptr ) ; free ( other . ptr ) ; return ret ; }
Try using the given conflict resolution "ID" to see
 if that recorded conflict resolves cleanly what we
 got in the "cur".
Try using the given conflict resolution " ID " to see if that recorded conflict resolves cleanly what we got in the " cur " .
/*
		 * A three-way merge. Note that this honors user-customizable
		 * low-level merge driver settings.
		 */