Home | History | Annotate | Download | only in diff

Lines Matching defs:FILE2

55 #define	FILE2	2
61 #define	FILEC	FILE2
369   /* Always compare file1 to file2, even if file2 is "-".
372      file0-file1 diffs didn't line up with the file0-file2 diffs
374      diff3 might report phantom changes from file1 to file2.  */
380   /* Historically, the default common file was file2.  Ediff for emacs
381      and possibly other applications, have therefore made file2 the
384      file2 as the common file. */
593  *   File2 is shared in common between the two diffs.
597  *	1) Find the range for the first block in File2.
598  *	    a) Take the lowest of the two ranges (in File2) in the two
617  *	 3) Copy all of the pointers for file2 in.  At least for now,
621  *	    need from file2 (when there isn't a diff block, it's
622  *	    identical to file2 within the range between diff blocks).
998   D_LOWLINE (result, FILE2) = low2;
999   D_HIGHLINE (result, FILE2) = high2;
1030   numlines = D_NUMLINES (result, FILE2);
1033       D_LINEARRAY (result, FILE2) = ALLOCATE (numlines, char *);
1034       D_LENARRAY (result, FILE2) = ALLOCATE (numlines, size_t);
1035       bzero (D_LINEARRAY (result, FILE2), (numlines * sizeof (char *)));
1036       bzero (D_LENARRAY (result, FILE2), (numlines * sizeof (size_t)));
1040       D_LINEARRAY (result, FILE2) = 0;
1041       D_LENARRAY (result, FILE2) = 0;
1586  * The arguments FILE0, FILE1 and FILE2 are the strings to print
1594 output_diff3_edscript (diff, mapping, rev_mapping, file0, file1, file2)
1597      char const *file0, *file1, *file2;
1639 	      /* Append lines from FILE2.  */
1641 	      leading_dot |= dotlines (b, mapping[FILE2]);
1643 	  printf_output (">>>>>>> %s\n", file2);
1647 		       + D_NUMLINES (b, mapping[FILE2]) + 1));
1666       else if (D_NUMLINES (b, mapping[FILE2]) == 0)
1694 	  undotlines (dotlines (b, mapping[FILE2]),
1696 FILE2]));
1711  * and FILE0, FILE1, and FILE2 are the names of the files.
1718 		    file0, file1, file2)
1722      char const *file0, *file1, *file2;
1800       /* Put in lines from FILE2.  */
1802 	   i < D_NUMLINES (b, mapping[FILE2]);
1804 	write_output (D_RELNUM (b, mapping[FILE2], i),
1805 		      D_RELLEN (b, mapping[FILE2], i));
1808 	printf_output (">>>>>>> %s\n", file2);