mirror of
https://github.com/darlinghq/darling-gnudiff.git
synced 2025-02-17 01:09:29 +00:00
gnudiff-25
This commit is contained in:
parent
6fc6747101
commit
d2fd9fe5a6
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
project.xcworkspace/
|
||||
xcuserdata/
|
||||
*~
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user