error_resolve_conflict   95 advice.c       	error_resolve_conflict(me);
error_resolve_conflict   25 advice.h       int error_resolve_conflict(const char *me);
error_resolve_conflict  213 sequencer.c    		return error_resolve_conflict(action_name(opts));