Home
last modified time | relevance | path

Searched refs:rev_mapping (Results 1 – 3 of 3) sorted by relevance

/netbsd-src/external/gpl2/xcvs/dist/diff/
H A Ddiff3.c261 int rev_mapping[3]; local
413 rev_mapping[mapping[i]] = i;
460 commonname = file[rev_mapping[FILEC]];
461 thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block,
475 thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block,
480 = output_diff3_edscript (diff3, mapping, rev_mapping,
484 FILE *mfp = fopen (file[rev_mapping[FILE0]], "r");
486 diff3_perror_with_exit (file[rev_mapping[FILE0]]);
487 conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping,
492 perror_with_name (file[rev_mapping[FILE0]]);
[all …]
/netbsd-src/external/gpl2/diffutils/dist/src/
H A Ddiff3.c240 int rev_mapping[3]; in main() local
378 rev_mapping[mapping[i]] = i; in main()
394 commonname = file[rev_mapping[FILEC]]; in main()
395 thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block); in main()
396 thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block); in main()
400 = output_diff3_edscript (stdout, diff3, mapping, rev_mapping, in main()
404 if (! freopen (file[rev_mapping[FILE0]], "r", stdin)) in main()
405 perror_with_exit (file[rev_mapping[FILE0]]); in main()
407 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping, in main()
414 output_diff3 (stdout, diff3, mapping, rev_mapping); in main()
[all …]
/netbsd-src/external/gpl2/diffutils/dist/
H A DChangeLog2974 (main): Compute rev_mapping here. Handle -a and -m.