RESOLVED          365 rerere.c       		*type = RESOLVED;
RESOLVED          423 rerere.c       		else if (conflict_type == RESOLVED) {