Lines Matching +full:3 +full:d1
15 * 3. All advertising materials mentioning features or use of this software
48 * 3. Neither the name of the University nor the names of its contributors
94 #define DIFF_TYPE3 3
108 #define EFLAG_UNMERGED 3
123 static FILE *fp[3];
124 static int cline[3]; /* # of the last-read line in each file (0-2) */
126 * The latest known correspondence between line numbers of the 3 files
127 * is stored in last[1-3];
169 #define OPTIONS "3aAeEiL:mTxX"
178 { "easy-only", no_argument, NULL, '3' },
189 fprintf(stderr, "usage: diff3 [-3aAeEimTxX] [-L label1] [-L label2] " in usage()
362 struct diff *d1, *d2, *d3; in merge() local
366 d1 = d13; in merge()
371 t1 = (d1 < d13 + m1); in merge()
377 if (!t2 || (t1 && d1->new.to < d2->new.from)) { in merge()
381 change(1, &d1->old, false); in merge()
382 keep(2, &d1->new); in merge()
383 change(3, &d1->new, false); in merge()
387 d1++; in merge()
391 if (!t1 || (t2 && d2->new.to < d1->new.from)) { in merge()
395 change(3, &d2->new, false); in merge()
409 if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) { in merge()
410 d1[1].old.from = d1->old.from; in merge()
411 d1[1].new.from = d1->new.from; in merge()
412 d1++; in merge()
424 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) { in merge()
425 dup = duplicate(&d1->old, &d2->old); in merge()
431 separate(dup ? "3" : ""); in merge()
432 change(1, &d1->old, dup); in merge()
434 d3 = d1->old.to > d1->old.from ? d1 : d2; in merge()
435 change(3, &d3->new, false); in merge()
437 j = edit(d1, dup, j, DIFF_TYPE3); in merge()
440 d1++; in merge()
448 if (d1->new.from < d2->new.from) { in merge()
449 d2->old.from -= d2->new.from - d1->new.from; in merge()
450 d2->new.from = d1->new.from; in merge()
451 } else if (d2->new.from < d1->new.from) { in merge()
452 d1->old.from -= d1->new.from - d2->new.from; in merge()
453 d1->new.from = d2->new.from; in merge()
455 if (d1->new.to > d2->new.to) { in merge()
456 d2->old.to += d1->new.to - d2->new.to; in merge()
457 d2->new.to = d1->new.to; in merge()
458 } else if (d2->new.to > d1->new.to) { in merge()
459 d1->old.to += d2->new.to - d1->new.to; in merge()
460 d1->new.to = d2->new.to; in merge()
519 * No difference was reported by diff between file 1 (or 2) and file 3,
529 delta = last[3] - last[i]; in keep()
703 * between the 3 files bracket the changes. Regurgitate the diffs in reverse
897 /* are the memset(3) calls needed? */ in increase()
945 case '3': in main()
966 if (nblabels >= 3) in main()
1009 if (argc != 3) { in main()