Home | History | Annotate | Download | only in diff

Lines Matching defs:conflicts_found

265   int conflicts_found;
481     conflicts_found
489       conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping,
499       conflicts_found = 0;
513   return conflicts_found;
1600   int conflicts_found = 0, conflict;
1624 	  conflicts_found = 1;
1700   return conflicts_found;
1726   int conflicts_found = 0, conflict;
1773 	  conflicts_found = 1;
1823 		return conflicts_found;
1833   return conflicts_found;