Searched refs:solved_conflicts (Results 1 – 5 of 5) sorted by relevance
211 const char *solved_conflicts; member
424 if ((report_flag & report_solved_conflicts) && s->solved_conflicts) in print_state()427 fputs (s->solved_conflicts, out); in print_state()
147 res->solved_conflicts = NULL; in state_new()
252 s->solved_conflicts = obstack_finish (&solved_conflicts_obstack); in resolve_sr_conflict()
9418 * src/state.h (state_t): `solved_conflicts' is a new member.9431 * src/print.c (print_state): Output its solved_conflicts.