DIFF_2ND 797 src/diff3.c D3_TYPE (result) = DIFF_2ND; DIFF_2ND 1385 src/diff3.c case DIFF_2ND: DIFF_2ND 1531 src/diff3.c case DIFF_2ND: if (!show_2nd) continue; conflict = true; break; DIFF_2ND 1571 src/diff3.c if (type == DIFF_2ND) DIFF_2ND 1649 src/diff3.c case DIFF_2ND: if (!show_2nd) continue; conflict = true; break;