dist/src/diff3.c

1342 output_diff3 (FILE *outputfile, struct diff3_block *diff,
1378       fprintf (outputfile, "====%s\n", x);
1390 	  fprintf (outputfile, "%d:", i + 1);
1394 	      fprintf (outputfile, "%lda\n", llowt - 1);
1397 	      fprintf (outputfile, "%ldc\n", llowt);
1400 	      fprintf (outputfile, "%ld,%ldc\n", llowt, lhight);
1411 		  fprintf (outputfile, "%s", line_prefix);
1414 		  fwrite (cp, sizeof (char), length, outputfile);
1418 		fprintf (outputfile, "\n\\ %s\n",
1431 dotlines (FILE *outputfile, struct diff3_block *b, int filenum)
1444 	  fprintf (outputfile, ".");
1447 	      D_RELLEN (b, filenum, i), outputfile);
1460 undotlines (FILE *outputfile, bool leading_dot, long start, lin num)
1462   fprintf (outputfile, ".\n");
1466 	fprintf (outputfile, "%lds/^\\.//\n", start);
1468 	fprintf (outputfile, "%ld,%lds/^\\.//\n", start, start + num - 1);
1495 output_diff3_edscript (FILE *outputfile, struct diff3_block *diff,
1532 	  fprintf (outputfile, "%lda\n", high0);
1539 		  fprintf (outputfile, "||||||| %s\n", file1);
1540 		  leading_dot = dotlines (outputfile, b, mapping[FILE1]);
1543 	      fprintf (outputfile, "=======\n");
1544 	      leading_dot |= dotlines (outputfile, b, mapping[FILE2]);
1546 	  fprintf (outputfile, ">>>>>>> %s\n", file2);
1547 	  undotlines (outputfile, leading_dot, high0 + 2,
1554 	  fprintf (outputfile, "%lda\n<<<<<<< %s\n", low0 - 1,
1560 	      leading_dot = dotlines (outputfile, b, mapping[FILE1]);
1561 	      fprintf (outputfile, "=======\n");
1563 	  undotlines (outputfile, leading_dot, low0 + 1,
1570 	    fprintf (outputfile, "%ldd\n", low0);
1572 	    fprintf (outputfile, "%ld,%ldd\n", low0, high0);
1580 	      fprintf (outputfile, "%lda\n", high0);
1583 	      fprintf (outputfile, "%ldc\n", high0);
1586 	      fprintf (outputfile, "%ld,%ldc\n", low0, high0);
1590 	  undotlines (outputfile, dotlines (outputfile, b, mapping[FILE2]),
1594   if (finalwrite) fprintf (outputfile, "w\nq\n");
1611 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff,
1655 	    putc (c, outputfile);
1666 	      fprintf (outputfile, "<<<<<<< %s\n", file0);
1671 			D_RELLEN (b, mapping[FILE0], i), outputfile);
1677 	      fprintf (outputfile, format_2nd, file1);
1682 			D_RELLEN (b, mapping[FILE1], i), outputfile);
1685 	  fprintf (outputfile, "=======\n");
1693 		D_RELLEN (b, mapping[FILE2], i), outputfile);
1696 	fprintf (outputfile, ">>>>>>> %s\n", file2);
1717     putc (c, outputfile);