Lines Matching refs:diff
59 struct diff {struct range old, new; }; struct
69 static struct diff d13[NC];
70 static struct diff d23[NC];
77 static struct diff de[NC];
101 static int readin(char *name, struct diff *dd);
115 static int edit(struct diff *diff, int dup, int j);
184 readin(char *name, struct diff *dd) in readin()
278 struct diff *d1, *d2, *d3; in merge()
515 edit(struct diff *diff, int dup, int j) in edit() argument
522 de[j].old.from = diff->old.from; in edit()
523 de[j].old.to = diff->old.to; in edit()
524 de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, (char *)0); in edit()
525 de[j].new.to = de[j].new.from + skip(2, diff->new.to, (char *)0); in edit()