Home
last modified time | relevance | path

Searched refs:DIFF_TYPE3 (Results 1 – 1 of 1) sorted by relevance

/freebsd/usr.bin/diff3/
H A Ddiff3.c94 #define DIFF_TYPE3 3 macro
437 j = edit(d1, dup, j, DIFF_TYPE3); in merge()
742 } else if (de[n].type == DIFF_TYPE3) { in Ascript()
812 else if (de[n].type == DIFF_TYPE3 && (old->from == old->to)) { in mergescript()
832 case DIFF_TYPE3: in mergescript()