Lines Matching refs:conflicts_found
263 int conflicts_found; local
479 conflicts_found
487 conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping,
497 conflicts_found = 0;
511 return conflicts_found;
1596 int conflicts_found = 0, conflict; local
1620 conflicts_found = 1;
1696 return conflicts_found;
1722 int conflicts_found = 0, conflict; local
1769 conflicts_found = 1;
1819 return conflicts_found;
1829 return conflicts_found;