Searched defs:conflicts_found (Results 1 – 2 of 2) sorted by relevance
263 int conflicts_found; local1596 int conflicts_found = 0, conflict; local1722 int conflicts_found = 0, conflict; local
242 bool conflicts_found; in main() local1496 bool conflicts_found = 0, conflict; in output_diff3_edscript() local1613 bool conflicts_found = 0, conflict; in output_diff3_merge() local