Searched refs:conflicts_found (Results 1 – 2 of 2) sorted by relevance
242 bool conflicts_found; in main() local399 conflicts_found in main()406 conflicts_found in main()415 conflicts_found = 0; in main()419 exit (conflicts_found); in main()420 return conflicts_found; in main()1496 bool conflicts_found = 0, conflict; in output_diff3_edscript() local1523 conflicts_found = 1; in output_diff3_edscript()1591 return conflicts_found; in output_diff3_edscript()1613 bool conflicts_found = 0, conflict; in output_diff3_merge() local[all …]
263 int conflicts_found; local479 conflicts_found487 conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping,497 conflicts_found = 0;511 return conflicts_found;1596 int conflicts_found = 0, conflict; local1620 conflicts_found = 1;1696 return conflicts_found;1722 int conflicts_found = 0, conflict; local1769 conflicts_found = 1;[all …]