DIFF_PAIR_UNMERGED 2486 diff.c if (!DIFF_PAIR_UNMERGED(p)) { DIFF_PAIR_UNMERGED 3179 diff.c if (DIFF_PAIR_UNMERGED(p)) { DIFF_PAIR_UNMERGED 3219 diff.c if (DIFF_PAIR_UNMERGED(p)) { DIFF_PAIR_UNMERGED 3243 diff.c if (DIFF_PAIR_UNMERGED(p)) { DIFF_PAIR_UNMERGED 4140 diff.c if (DIFF_PAIR_UNMERGED(p)) DIFF_PAIR_UNMERGED 4258 diff.c if (DIFF_PAIR_UNMERGED(p)) DIFF_PAIR_UNMERGED 4465 diff.c if (DIFF_PAIR_UNMERGED(p)) DIFF_PAIR_UNMERGED 479 diffcore-rename.c else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) { DIFF_PAIR_UNMERGED 595 diffcore-rename.c if (DIFF_PAIR_UNMERGED(p)) {