4 years ago Stefan Sperling
show original file content in conflict markers
properly handle read errors in got_packidx_init_hdr (found by jj@ scan-build)
prevent a NULL deref in an error path of got.c's diff_trees()
improve use of mixed size_t/off_t types in diff3.c's edscript()
diff3.c: do not use the same variables for both line numbers and byte offsets
diff3.c's skip() returns number of bytes skipped so switch from int to size_t
sync distfile list
remove worklist code; it was only used to unlink files which we already unlink
diff3.c: check for unlink errors and unlink dp13 and dp23 again
rename local variable in diff3.c's edscript() from j to len (not a loop index)
rename local variable in diff3.c's skip() from j to len (not a loop index)
remove pointless attempt of unlinking temporary file name template paths
do not leak open file in diff3.c's readin() error paths
do not abuse d3s->fp[0] as a local variable in diff3.c's readin()
remove unused 'pr' argument from diff3.c's skip() function
