DIFF_3RD 813 src/diff3.c D3_TYPE (result) = DIFF_3RD; DIFF_3RD 1386 src/diff3.c case DIFF_3RD: DIFF_3RD 1532 src/diff3.c case DIFF_3RD: if (overlap_only) continue; conflict = false; break; DIFF_3RD 1650 src/diff3.c case DIFF_3RD: if (overlap_only) continue; conflict = false; break;