Lines Matching defs:diff3
1 /* Three way file comparison program (diff3) for Project GNU.
26 /* diff3.c has a real initialize_main function. */
48 * Internal data structures and macros for the diff3 program; includes
49 * data structures for both diff3 diffs and normal diffs.
137 * Access the type of a diff3 block.
167 /* If nonzero, write out an ed script instead of the standard diff3 format. */
230 /* Permit non-local exits from diff3. */
269 struct diff3_block *diff3;
325 (*callbacks->write_stdout) ("diff3 - GNU diffutils version ");
330 printf ("diff3 - GNU diffutils version %s\n", diff_version_string);
374 diff3 might report phantom changes from file1 to file2. */
479 diff3 = make_3way_diff (thread0, thread1);
482 = output_diff3_edscript (diff3, mapping, rev_mapping,
489 conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping,
498 output_diff3 (diff3, mapping, rev_mapping);
504 free_diff3_blocks(diff3);
812 * threads) and puts them together into one diff3 block.
813 * It then returns a pointer to this diff3 block or 0 for failure.
1572 * This routine outputs a diff3 set of blocks as an ed script. This
1576 * destructive things to the set of diff3 blocks it is passed; it
1837 * Reverse the order of the list of diff3 blocks.
Indexes created Wed Mar 04 05:31:52 UTC 2026