gnudiff-25

This commit is contained in:
Ariel Abreu 2020-08-02 14:40:01 -04:00
parent 6fc6747101
commit d2fd9fe5a6
No known key found for this signature in database
GPG Key ID: ECF8C2B9E8AD3E6B
2 changed files with 4 additions and 1 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
project.xcworkspace/
xcuserdata/
*~

View File

@ -1402,7 +1402,7 @@ output_diff3 (FILE *outputfile, struct diff3_block *diff,
line = 0;
do
{
fprintf (outputfile, line_prefix);
fprintf (outputfile, "%s", line_prefix);
cp = D_RELNUM (ptr, realfile, line);
length = D_RELLEN (ptr, realfile, line);
fwrite (cp, sizeof (char), length, outputfile);