HomeSort by: relevance | last modified time | path
    Searched defs:conflicts_found (Results 1 - 2 of 2) sorted by relevancy

  /src/external/gpl2/diffutils/dist/src/
diff3.c 244 bool conflicts_found;
401 conflicts_found
408 conflicts_found
417 conflicts_found = 0;
421 exit (conflicts_found);
422 return conflicts_found;
1500 bool conflicts_found = 0, conflict;
1527 conflicts_found = 1;
1595 return conflicts_found;
1617 bool conflicts_found = 0, conflict
242 bool conflicts_found; local
1496 bool conflicts_found = 0, conflict; local
1613 bool conflicts_found = 0, conflict; local
    [all...]
  /src/external/gpl2/xcvs/dist/diff/
diff3.c 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
263 int conflicts_found; local
1596 int conflicts_found = 0, conflict; local
1722 int conflicts_found = 0, conflict; local
    [all...]

Completed in 28 milliseconds