Searched refs:overlap_only (Results 1 - 2 of 2) sorted by relevance

/freebsd-9.3-release/contrib/cvs/diff/
H A Ddiff3.c188 static int overlap_only;
300 overlap_only = 1;
314 overlap_only = 1;
1619 case DIFF_3RD: if (overlap_only) continue; conflict = 0; break;
1747 case DIFF_3RD: if (overlap_only) continue; conflict = 0; break;
1892 overlap_only = 0;
186 static int overlap_only; variable
/freebsd-9.3-release/contrib/diff/src/
H A Ddiff3.c153 static bool overlap_only;
252 overlap_only = true;
266 overlap_only = true;
1516 case DIFF_3RD: if (overlap_only) continue; conflict = false; break;
1633 case DIFF_3RD: if (overlap_only) continue; conflict = false; break;
151 static bool overlap_only; variable

Completed in 60 milliseconds