Home
last modified time | relevance | path

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

/plan9/sys/src/ape/cmd/diff/
H A Ddiff3.c75 struct diff3_block { struct
80 struct diff3_block *next; argument
186 static int dotlines PARAMS((FILE *, struct diff3_block *, int));
187 static int output_diff3_edscript PARAMS((FILE *, struct diff3_block *, int const[3], int const[3], …
188 static int output_diff3_merge PARAMS((FILE *, FILE *, struct diff3_block *, int const[3], int const…
190 static struct diff3_block *create_diff3_block PARAMS((int, int, int, int, int, int));
191 static struct diff3_block *make_3way_diff PARAMS((struct diff_block *, struct diff_block *));
192 static struct diff3_block *reverse_diff3_blocklist PARAMS((struct diff3_block *));
193 static struct diff3_block *using_to_diff3_block PARAMS((struct diff_block *[2], struct diff_block *…
197 static void output_diff3 PARAMS((FILE *, struct diff3_block *, int const[3], int const[3]));
[all …]
H A DChangeLog1337 (struct diff3_block): Likewise.