Searched refs:DIFF_ALL (Results 1 – 2 of 2) sorted by relevance
78 DIFF_ALL, /* All three are different */ enumerator935 D3_TYPE (result) = DIFF_ALL;1457 case DIFF_ALL:1601 = ((b->correspond == DIFF_ALL) ?1602 DIFF_ALL :1625 if (type == DIFF_ALL)1648 type == DIFF_ALL ? file0 : file1);1728 = ((b->correspond == DIFF_ALL) ?1729 DIFF_ALL :1741 case DIFF_ALL: if (simple_only) continue; conflict = flagging;[all …]
71 DIFF_ALL, /* All three are different */ enumerator863 D3_TYPE (result) = DIFF_ALL; in using_to_diff3_block()1412 case DIFF_ALL: in output_diff3()1553 = (b->correspond == DIFF_ALL in output_diff3_edscript()1554 ? DIFF_ALL in output_diff3_edscript()1580 if (type == DIFF_ALL) in output_diff3_edscript()1601 type == DIFF_ALL ? file0 : file1); in output_diff3_edscript()1672 = ((b->correspond == DIFF_ALL) in output_diff3_merge()1673 ? DIFF_ALL in output_diff3_merge()1683 case DIFF_ALL: if (simple_only) continue; conflict = flagging; in output_diff3_merge()[all …]