Lines Matching defs:file2
327 /* Always compare file1 to file2, even if file2 is "-".
330 file0-file1 diffs didn't line up with the file0-file2 diffs
332 diff3 might report phantom changes from file1 to file2.
338 Historically, the default common file was file2, so some older
339 applications (e.g. Emacs ediff) used file2 as the ancestor. So,
341 edscript), prefer file2 as the common file. */
495 3) Copy all of the pointers for file2 in. At least for now,
499 needed from file2 (when there isn't a diff block, it's
500 identical to file2 within the range between diff blocks).
1494 char const *file0, char const *file1, char const *file2)
1544 fprintf (outputfile, ">>>>>>> %s\n", file2);
1610 char const *file0, char const *file1, char const *file2)
1694 fprintf (outputfile, ">>>>>>> %s\n", file2);