Searched refs:conflicts_found (Results 1 – 1 of 1) sorted by relevance
220 bool conflicts_found; in main() local382 conflicts_found in main()389 conflicts_found in main()398 conflicts_found = false; in main()402 exit (conflicts_found); in main()403 return conflicts_found; in main()1521 conflicts_found = true; in output_diff3_edscript()1589 return conflicts_found; in output_diff3_edscript()1655 conflicts_found = true; in output_diff3_merge()1705 return conflicts_found; in output_diff3_merge()[all …]